aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/pkg-build.testscript58
-rw-r--r--tests/rep-fetch.testscript11
2 files changed, 41 insertions, 28 deletions
diff --git a/tests/pkg-build.testscript b/tests/pkg-build.testscript
index fc89df5..d30186a 100644
--- a/tests/pkg-build.testscript
+++ b/tests/pkg-build.testscript
@@ -4625,33 +4625,36 @@ test.arguments += --sys-no-query
$backend_configured
EOO
- # No upgrade after turning a package from the archive-based repo
- # into an external package.
+ # Iteration increment and upgrade after turning a package from the
+ # archive-based repo into an external package.
#
$* fax/ 2>>~%EOE%;
- %info: .+fax-1.0.0.+ is up to date%
- updated fax/1.0.0
+ disfigured fax/1.0.0
+ using fax/1.0.0#1 (external)
+ configured fax/1.0.0#1
+ %info: .+dir.fax.+ is up to date%
+ updated fax/1.0.0#1
EOE
$pkg_status -r >>"EOO";
- !fax configured !1.0.0
+ !fax configured !1.0.0#1
$backend_configured
EOO
- # Upgrade after the package' buildfile is edited.
+ # Further upgrade after the package' buildfile is edited.
#
echo '' >+fax/build/root.build;
$* fax/ 2>>~%EOE%;
- disfigured fax/1.0.0
- using fax/1.0.0#1 (external)
- configured fax/1.0.0#1
+ disfigured fax/1.0.0#1
+ using fax/1.0.0#2 (external)
+ configured fax/1.0.0#2
%info: .+fax.+ is up to date%
- updated fax/1.0.0#1
+ updated fax/1.0.0#2
EOE
$pkg_status -r >>"EOO";
- !fax configured !1.0.0#1
+ !fax configured !1.0.0#2
$backend_configured
EOO
@@ -4659,11 +4662,11 @@ test.arguments += --sys-no-query
#
$* fax/ 2>>~%EOE%;
%info: .+fax.+ is up to date%
- updated fax/1.0.0#1
+ updated fax/1.0.0#2
EOE
$pkg_status -r >>"EOO";
- !fax configured !1.0.0#1
+ !fax configured !1.0.0#2
$backend_configured
EOO
@@ -4692,37 +4695,40 @@ test.arguments += --sys-no-query
$backend_configured
EOO
- # No upgrade after turning a package from the archive-based repo
- # into an external package.
+ # Iteration increment and upgrade after turning a package from the
+ # archive-based repo into an external package.
#
$rep_add --type dir fax/ && $rep_fetch;
$* fax 2>>~%EOE%;
- %info: .+fax-1.0.0.+ is up to date%
- updated fax/1.0.0
+ disfigured fax/1.0.0
+ using fax/1.0.0#1 (external)
+ configured fax/1.0.0#1
+ %info: .+dir.fax.+ is up to date%
+ updated fax/1.0.0#1
EOE
$pkg_status -r >>"EOO";
- !fax configured 1.0.0
+ !fax configured 1.0.0#1
$backend_configured
EOO
- # Upgrade after the package' buildfile is edited.
+ # Further upgrade after the package' buildfile is edited.
#
echo '' >+fax/build/root.build;
$rep_fetch;
$* fax 2>>~%EOE%;
- disfigured fax/1.0.0
- using fax/1.0.0#1 (external)
- configured fax/1.0.0#1
+ disfigured fax/1.0.0#1
+ using fax/1.0.0#2 (external)
+ configured fax/1.0.0#2
%info: .+fax.+ is up to date%
- updated fax/1.0.0#1
+ updated fax/1.0.0#2
EOE
$pkg_status -r >>"EOO";
- !fax configured 1.0.0#1
+ !fax configured 1.0.0#2
$backend_configured
EOO
@@ -4732,11 +4738,11 @@ test.arguments += --sys-no-query
$* fax 2>>~%EOE%;
%info: .+fax.+ is up to date%
- updated fax/1.0.0#1
+ updated fax/1.0.0#2
EOE
$pkg_status -r >>"EOO";
- !fax configured 1.0.0#1
+ !fax configured 1.0.0#2
$backend_configured
EOO
diff --git a/tests/rep-fetch.testscript b/tests/rep-fetch.testscript
index b9b9e05..b713c0c 100644
--- a/tests/rep-fetch.testscript
+++ b/tests/rep-fetch.testscript
@@ -631,11 +631,15 @@ if! $remote
: unchanged-external
:
+ : Test that iteration is still incremented when a non-external package
+ : from a pkg repository is switched to the same unedited external
+ : package.
+ :
{
$clone_cfg && $rep_add $src/libhello-1.0.0;
$* 2>!;
- $pkg_status libhello >'libhello unpacked 1.0.0'
+ $pkg_status libhello >'libhello unpacked 1.0.0 available 1.0.0#1'
}
: changed-external
@@ -655,6 +659,9 @@ if! $remote
: git-rep
:
+ : Test that iteration is still incremented when a non-external package
+ : from a git repository is switched to the same unedited external package.
+ :
if ($git_supported && !$remote)
{
rep = $canonicalize([dir_path] $out_git/state0);
@@ -668,7 +675,7 @@ if! $remote
$rep_add $rep/style.git;
$* 2>!;
- $pkg_status style >"style unpacked 1.0.0";
+ $pkg_status style >"style unpacked 1.0.0 available 1.0.0#1";
$pkg_purge style 2>"purged style/1.0.0"
}