thodg/got/regress/cmdline/import.sh

Tag - branch -mainorigin/HEADorigin/gotwebdorigin/main- tag -0.90.80.720.710.700.70.690.680.670.660.650.640.630.620.610.600.60.590.580.570.560.550.540.530.520.510.500.50.490.480.470.460.450.440.430.420.410.400.40.390.380.370.360.350.340.330.320.310.300.30.290.280.270.260.250.240.230.220.210.200.20.190.180.170.160.150.140.130.120.110.100.1

• Show log

  Commit

• Hash : 71db5e8c
  Author :
  Date : 2019-08-09T00:49:50
  

  fix empty variable in two import regress tests

Download

• regress/cmdline/import.sh

• #!/bin/sh
  #
  # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
  #
  # Permission to use, copy, modify, and distribute this software for any
  # purpose with or without fee is hereby granted, provided that the above
  # copyright notice and this permission notice appear in all copies.
  #
  # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
  . ./common.sh
  
  function test_import_basic {
  	local testname=import_basic
  	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
  
  	got init $testroot/repo
  
  	mkdir $testroot/tree
  	make_test_tree $testroot/tree
  
  	got import -m 'init' -r $testroot/repo $testroot/tree \
  		> $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	local head_commit=`git_show_head $testroot/repo`
  	echo "A  $testroot/tree/gamma/delta" > $testroot/stdout.expected
  	echo "A  $testroot/tree/epsilon/zeta" >> $testroot/stdout.expected
  	echo "A  $testroot/tree/alpha" >> $testroot/stdout.expected
  	echo "A  $testroot/tree/beta" >> $testroot/stdout.expected
  	echo "Created branch refs/heads/master with commit $head_commit" \
  		>> $testroot/stdout.expected
  
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	(cd $testroot/repo && got log -p | grep -v ^date: > $testroot/stdout)
  
  	id_alpha=`get_blob_id $testroot/repo "" alpha`
  	id_beta=`get_blob_id $testroot/repo "" beta`
  	id_zeta=`get_blob_id $testroot/repo epsilon zeta`
  	id_delta=`get_blob_id $testroot/repo gamma delta`
  
  	echo "-----------------------------------------------" \
  		> $testroot/stdout.expected
  	echo "commit $head_commit (master)" >> $testroot/stdout.expected
  	echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
  	echo " " >> $testroot/stdout.expected
  	echo " init" >> $testroot/stdout.expected
  	echo " " >> $testroot/stdout.expected
  	echo "diff /dev/null $head_commit" >> $testroot/stdout.expected
  	echo "blob - /dev/null" >> $testroot/stdout.expected
  	echo "blob + $id_alpha" >> $testroot/stdout.expected
  	echo "--- /dev/null" >> $testroot/stdout.expected
  	echo "+++ alpha" >> $testroot/stdout.expected
  	echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
  	echo "+alpha" >> $testroot/stdout.expected
  	echo "blob - /dev/null" >> $testroot/stdout.expected
  	echo "blob + $id_beta" >> $testroot/stdout.expected
  	echo "--- /dev/null" >> $testroot/stdout.expected
  	echo "+++ beta" >> $testroot/stdout.expected
  	echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
  	echo "+beta" >> $testroot/stdout.expected
  	echo "blob - /dev/null" >> $testroot/stdout.expected
  	echo "blob + $id_zeta" >> $testroot/stdout.expected
  	echo "--- /dev/null" >> $testroot/stdout.expected
  	echo "+++ epsilon/zeta" >> $testroot/stdout.expected
  	echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
  	echo "+zeta" >> $testroot/stdout.expected
  	echo "blob - /dev/null" >> $testroot/stdout.expected
  	echo "blob + $id_delta" >> $testroot/stdout.expected
  	echo "--- /dev/null" >> $testroot/stdout.expected
  	echo "+++ gamma/delta" >> $testroot/stdout.expected
  	echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
  	echo "+delta" >> $testroot/stdout.expected
  	echo "" >> $testroot/stdout.expected
  
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "A  $testroot/wt/alpha" > $testroot/stdout.expected
  	echo "A  $testroot/wt/beta" >> $testroot/stdout.expected
  	echo "A  $testroot/wt/epsilon/zeta" >> $testroot/stdout.expected
  	echo "A  $testroot/wt/gamma/delta" >> $testroot/stdout.expected
  	echo "Now shut up and hack" >> $testroot/stdout.expected
  
  	got checkout $testroot/repo $testroot/wt > $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	echo "alpha" > $testroot/content.expected
  	echo "beta" >> $testroot/content.expected
  	echo "zeta" >> $testroot/content.expected
  	echo "delta" >> $testroot/content.expected
  	cat $testroot/wt/alpha $testroot/wt/beta $testroot/wt/epsilon/zeta \
  	    $testroot/wt/gamma/delta > $testroot/content
  
  	cmp -s $testroot/content.expected $testroot/content
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/content.expected $testroot/content
  	fi
  	test_done "$testroot" "$ret"
  }
  
  function test_import_requires_new_branch {
  	local testroot=`test_init import_requires_new_branch`
  
  	mkdir $testroot/tree
  	make_test_tree $testroot/tree
  
  	got import -m 'init' -r $testroot/repo $testroot/tree \
  		> $testroot/stdout 2> $testroot/stderr
  	ret="$?"
  	if [ "$ret" == "0" ]; then
  		echo "import command should have failed but did not"
  		test_done "$testroot" "1"
  		return 1
  	fi
  
  	echo "got: import target branch already exists" \
  		> $testroot/stderr.expected
  	cmp -s $testroot/stderr.expected $testroot/stderr
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stderr.expected $testroot/stderr
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	got import -b newbranch -m 'init' -r $testroot/repo $testroot/tree  \
  		> $testroot/stdout
  	ret="$?"
  	test_done "$testroot" "$ret"
  
  }
  
  function test_import_ignores {
  	local testname=import_ignores
  	local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
  
  	got init $testroot/repo
  
  	mkdir $testroot/tree
  	make_test_tree $testroot/tree
  
  	got import -I alpha -I '*lta*' -I '*silon' \
  		-m 'init' -r $testroot/repo $testroot/tree > $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		test_done "$testroot" "$ret"
  		return 1
  	fi
  
  	local head_commit=`git_show_head $testroot/repo`
  	echo "A  $testroot/tree/beta" >> $testroot/stdout.expected
  	echo "Created branch refs/heads/master with commit $head_commit" \
  		>> $testroot/stdout.expected
  
  	cmp -s $testroot/stdout.expected $testroot/stdout
  	ret="$?"
  	if [ "$ret" != "0" ]; then
  		diff -u $testroot/stdout.expected $testroot/stdout
  	fi
  	test_done "$testroot" "$ret"
  
  
  }
  
  run_test test_import_basic
  run_test test_import_requires_new_branch
  run_test test_import_ignores
  

Download