From f619db022734dff6b988c514e3a292a5c7babaf0 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 22 Feb 2018 15:02:15 +0300
Subject: Invent repository_state() function

---
 tests/rep-add.test              | 8 ++++----
 tests/rep-fetch-git-branch.test | 6 +++---
 tests/rep-fetch-git-commit.test | 8 ++++----
 tests/rep-info.test             | 6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/rep-add.test b/tests/rep-add.test
index a84f725..be72b51 100644
--- a/tests/rep-add.test
+++ b/tests/rep-add.test
@@ -66,14 +66,14 @@
     :
     $clone_cfg;
     $* 'git://example.org/repo#master' 2>>EOE
-      added repository git:example.org/repo
+      added repository git:example.org/repo#master
       EOE
 
     : http-git
     :
     $clone_cfg;
     $* 'http://example.org/repo.git#master' 2>>EOE
-      added repository git:example.org/repo
+      added repository git:example.org/repo#master
       EOE
 
     : http-bpkg
@@ -151,10 +151,10 @@
   $clone_cfg;
 
   $* 'git://example.org/testing#master' 2>>~%EOE%;
-    %added repository git:example.org/testing%
+    %added repository git:example.org/testing#master%
     EOE
 
   $* 'git://www.example.org/testing#master' 2>>~%EOE% != 0
-    %error: git:example.org/testing is already a repository of this configuration%
+    %error: git:example.org/testing#master is already a repository of this configuration%
     EOE
 }
diff --git a/tests/rep-fetch-git-branch.test b/tests/rep-fetch-git-branch.test
index 86f5cb1..61699bb 100644
--- a/tests/rep-fetch-git-branch.test
+++ b/tests/rep-fetch-git-branch.test
@@ -39,7 +39,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
   end;
 
   $* 2>>~"%EOE%"
-    %fetching git:.+libfoo%
+    %fetching git:.+libfoo#$branch%
     $warn1
     %Cloning into '.+$branch'.+%
     %Submodule 'doc/style' .+ registered for path 'doc/style'%
@@ -79,7 +79,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%"
-      %fetching git:.+libfoo%
+      %fetching git:.+libfoo#$branch%
       $warn
       %Fetching in '.+$branch'.+%
       1 package\(s\) in 1 repository\(s\)
@@ -132,7 +132,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%" 1>&2;
-      %fetching git:.+libfoo%
+      %fetching git:.+libfoo#$branch%
       $warn1
       %Fetching in '.+$branch'.+%
       %warning: unable to rmdir '?libbar'?:.+%
diff --git a/tests/rep-fetch-git-commit.test b/tests/rep-fetch-git-commit.test
index 3547010..ba05de5 100644
--- a/tests/rep-fetch-git-commit.test
+++ b/tests/rep-fetch-git-commit.test
@@ -41,7 +41,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%"
-      %fetching git:.+style-basic%
+      %fetching git:.+style-basic#@$commit%
       $warn
       %Cloning into '.+$abbr_commit'.+%
       $fetch
@@ -70,7 +70,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%"
-      %fetching git:.+style-basic%
+      %fetching git:.+style-basic#stable@$commit%
       $warn
       %Cloning into '.+$abbr_commit'.+%
       $fetch
@@ -99,7 +99,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%"
-      %fetching git:.+style-basic%
+      %fetching git:.+style-basic#@$commit%
       $warn
       %Cloning into '.+$abbr_commit'.+%
       $fetch
@@ -119,7 +119,7 @@ warning: fetching over dumb HTTP, no progress will be shown'
     end;
 
     $* 2>>~"%EOE%"
-      %fetching git:.+style-basic%
+      %fetching git:.+style-basic#stable@$commit%
       $warn
       %Cloning into '.+$abbr_commit'.+%
       1 package\(s\) in 1 repository\(s\)
diff --git a/tests/rep-info.test b/tests/rep-info.test
index 32b77fb..ce0c6d4 100644
--- a/tests/rep-info.test
+++ b/tests/rep-info.test
@@ -153,7 +153,7 @@ else
   : Version module is enabled for the project.
   :
   $* "$rep/style-basic.git#master" >>~%EOO%
-  %git:.+style-basic .+style-basic.git#master%
+  %git:.+style-basic#master .+style-basic.git#master%
 
   %style-basic/1\.1\.0-a\.0\..+%
   EOO
@@ -163,8 +163,8 @@ else
   : The packages and repositories files are present in the repository root.
   :
   $* "$rep/libbar.git#master" >>~%EOO%
-  %git:.+libbar .+libbar.git#master%
-  %prerequisite git:.+style-basic .+style-basic.git#stable%
+  %git:.+libbar#master .+libbar.git#master%
+  %prerequisite git:.+style-basic#stable .+style-basic.git#stable%
 
   libbar/1.0.0
   libmbar/1.0.0
-- 
cgit v1.1