From b1888e516c9c9d750726318227bf69856ec91b8b Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 31 Aug 2018 21:41:53 +0300
Subject: Add ci-load

---
 tests/submit/0f6b1460b3ec/package.manifest | 10 ----------
 tests/submit/0f6b1460b3ec/result.manifest  |  4 ----
 tests/submit/README                        | 12 ++++++++----
 tests/submit/submit-dir.test               |  2 +-
 tests/submit/submit-git.test               | 11 +++++++++--
 5 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 tests/submit/0f6b1460b3ec/package.manifest
 delete mode 100644 tests/submit/0f6b1460b3ec/result.manifest

(limited to 'tests/submit')

diff --git a/tests/submit/0f6b1460b3ec/package.manifest b/tests/submit/0f6b1460b3ec/package.manifest
deleted file mode 100644
index 6fc36e7..0000000
--- a/tests/submit/0f6b1460b3ec/package.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-: 1
-name: libhello
-version: 0.1.0
-project: hello
-summary: hello library
-license: TODO
-url: https://example.org/hello
-email: user@example.org
-depends: * build2 >= 0.8.0-
-depends: * bpkg >= 0.8.0-
diff --git a/tests/submit/0f6b1460b3ec/result.manifest b/tests/submit/0f6b1460b3ec/result.manifest
deleted file mode 100644
index 93a3555..0000000
--- a/tests/submit/0f6b1460b3ec/result.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-: 1
-status: 200
-message: libhello/0.1.0 submission is queued
-reference: 0f6b1460b3ec
diff --git a/tests/submit/README b/tests/submit/README
index 7286c83..49ebd1e 100644
--- a/tests/submit/README
+++ b/tests/submit/README
@@ -22,9 +22,13 @@ Move the archive into brep/tests/submit/ directory.
 
 Locally run brep server configured to use submit-dir handler.
 
-$ bdep publish --control http://example.org/hello.git \
-       --email user@example.org --repository http://localhost/pkg --yes \
-       -d hello
+$ bdep publish \
+--control http://example.org/hello.git \
+--email user@example.org \
+--repository http://localhost/pkg \
+--yes \
+-d hello
 
 Replace the submission data directory in brep/tests/submit/ with the one
-produced with the above command.
+produced with the above command, removing package.manifest and result.manifest
+files it contains.
diff --git a/tests/submit/submit-dir.test b/tests/submit/submit-dir.test
index a6a7e3e..821898e 100644
--- a/tests/submit/submit-dir.test
+++ b/tests/submit/submit-dir.test
@@ -12,7 +12,7 @@
   %\[.+\] \[brep:error\] \[ref \] \[brep-submit-dir\]: usage: .+brep-submit-dir <dir>%
   EOE
 
-  : not-exist
+  : dir-not-exist
   :
   $* $~/dir 2>>~%EOE% != 0
     %\[.+\] \[brep:error\] \[ref dir\] \[brep-submit-dir\]: '.+dir' does not exist or is not a directory%
diff --git a/tests/submit/submit-git.test b/tests/submit/submit-git.test
index f96f79d..bedfd5f 100644
--- a/tests/submit/submit-git.test
+++ b/tests/submit/submit-git.test
@@ -66,15 +66,22 @@ pkg_ctl="$prj_ctl/hello.git"
 
   : dir-only
   :
-  $* $~/dir 2>>~%EOE% != 0
+  $* dir 2>>~%EOE% != 0
     %\[.+\] \[brep:error\] \[ref dir\] \[brep-submit-git\]: usage: .+brep-submit-git \[<options>\] <tgt-repo> \[<ref-repo>\] <dir>%
     EOE
 
   : ref-not-exist
   :
-  $* "$root_tgt_url" ref $~/dir 2>>~%EOE% != 0
+  $* "$root_tgt_url" ref dir 2>>~%EOE% != 0
     %\[.+\] \[brep:error\] \[ref dir\] \[brep-submit-git\]: 'ref' does not exist or is not a directory%
     EOE
+
+  : dir-not-exist
+  :
+  mkdir ref;
+  $* "$root_tgt_url" ref dir 2>>~%EOE% != 0
+    %\[.+\] \[brep:error\] \[ref dir\] \[brep-submit-git\]: 'dir' does not exist or is not a directory%
+    EOE
 }
 
 : success
-- 
cgit v1.1