From e51b7a62acdb2c12561955f3880e491f78735863 Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@funkthat.com>
Date: Thu, 22 Sep 2022 10:51:59 -0700
Subject: [PATCH] cover a couple missed cases for _archive..

hide coverage in test code
---
 ui/fixtures/cmd.container.tar.json |  13 +++++++++++--
 ui/fixtures/testfile.tar.gz        | Bin 178 -> 214 bytes
 ui/medashare/cli.py                |   5 ++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/fixtures/cmd.container.tar.json b/ui/fixtures/cmd.container.tar.json
index e089666..69c77db 100644
--- a/ui/fixtures/cmd.container.tar.json
+++ b/ui/fixtures/cmd.container.tar.json
@@ -24,8 +24,17 @@
 		{ "files": [ "testfiles/newfile.txt", "testfiles/test.txt" ],
 		  "hashes": [ "sha512:90f8342520f0ac57fb5a779f5d331c2fa87aa40f8799940257f9ba619940951e67143a8d746535ed0284924b2b7bc1478f095198800ba96d01847d7b56ca465c", "sha512:7d5768d47b6bc27dc4fa7e9732cfa2de506ca262a2749cb108923e5dddffde842bbfee6cb8d692fb43aca0f12946c521cce2633887914ca1f96898478d10ad3f" ],
 		  "type": "container",
-		  "uri": "hash://sha512/79fab684ca73e25994c1b739dcf8f03acf27dff74d63b4b3affd9aa69fbb37d23794b723802cad131969225403846f8f8c470bc2432c32de34d39f044a360073" },
-		{ "type": "file", "hashes": [ "sha512:79fab684ca73e25994c1b739dcf8f03acf27dff74d63b4b3affd9aa69fbb37d23794b723802cad131969225403846f8f8c470bc2432c32de34d39f044a360073" ] }
+		  "uri": "hash://sha512/80b8615104d04870ca23a0df0b63097a84a05fabf0813ced03482f742402d8c06598e32dc080e584935c4901d424c9d08d987040e3f49ef11732af5c8bf6e2aa" },
+		{ "type": "file", "hashes": [ "sha512:80b8615104d04870ca23a0df0b63097a84a05fabf0813ced03482f742402d8c06598e32dc080e584935c4901d424c9d08d987040e3f49ef11732af5c8bf6e2aa" ] }
 	]
+},
+{
+	"title": "import tar.gz container",
+	"cmd": [ "container", "testfile.tar.gz" ]
+},
+{
+        "special": "verify store object cnt",
+        "comment": "should have one container and one file",
+        "count": 2
 }
 ]
diff --git a/ui/fixtures/testfile.tar.gz b/ui/fixtures/testfile.tar.gz
index 2ccd6716f025391fe8b582b7dbe21b108130d995..b2559b8485a5b0528778289dfd0a5d3e1b20c3ee 100644
GIT binary patch
literal 214
zcmV;{04e_;iwFQ%pDbel1MQW;4#FS|hB^BbeFE1)f#=y_=!|+0j6S}_CDVf;9<~`X
zzL2y85=zSdle(Bff9zs&?ru5Rrh8J;f{2b8a`etVBkEy3pbZdfk4$JC0+J=i3UJ~&
zK5~tzy+|pC)2_HrwuMkwA8rC;{1ei?k07H3=|AKLu=#aKl?6$o{zEg@8Cmz%7W6NA
zAvR=)ywxQ7H(DD7cCLcnS-bwn{^x84^H*Q^KY1X-9-Wpn`#;MEQ2l=iUjCo^U%kIl
QsZ`d&19*7-2>=cN02df!AOHXW

literal 178
zcmV;j08RfNiwFQ1p(bMh1MQT-4#FS|Ksoyr{Q_-Sf$!M?bVfZ$jefo$$-J1w!<;ep
zg`_3)P*NTev!vk=^X3$<HCf9|%)B6?XNDSscaMm+?HjfOVjGYNoku`&<k<ku+{a5U
zS^9HnWq;gG)|Il9CeGVUV2nS4?1l_w^-$&y^#QED-IB5(GWuV$56Exc@Sg%u#{s=9
gY4xAW2cZ5h!PEabe|29`6y;yI1B+Ti6aWkW0O9~s`Tzg`

diff --git a/ui/medashare/cli.py b/ui/medashare/cli.py
index 73673bd..22eebb2 100644
--- a/ui/medashare/cli.py
+++ b/ui/medashare/cli.py
@@ -710,6 +710,7 @@ class FileObject(MDBase):
 			mode = mode & ~nbit
 
 		return '|'.join(r)
+
 	@classmethod
 	def _real_stat_repr(cls, st): # pragma: no cover
 		return 'os.stat_result' \
@@ -1779,6 +1780,7 @@ class _TestCases(unittest.TestCase):
 			# repr on os.stat_result doesn't work
 			#  (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime)
 
+			'f': os.stat_result((stat.S_IROTH|stat.S_IXOTH|stat.S_IRGRP|stat.S_IXGRP|stat.S_IXUSR|stat.S_IRUSR|stat.S_IFDIR, 10, 100, 2, 100, 100, 1024, 1654166365, 1558388856.000000, 1663133775)),
 			'test.txt': os.stat_result((stat.S_IROTH|stat.S_IRGRP|stat.S_IWUSR|stat.S_IRUSR|stat.S_IFREG, 10, 100, 1, 100, 100, 15, 1654166365, 1558388856.000000, 1663133775)),
 			'newfile.txt': os.stat_result((stat.S_IROTH|stat.S_IRGRP|stat.S_IWUSR|stat.S_IRUSR|stat.S_IFREG, 10, 100, 1, 100, 100, 19, 1659652579, 1658982768.041291, 1663133775)),
 			'sample.data.sqlite3': os.stat_result((stat.S_IROTH|stat.S_IRGRP|stat.S_IWUSR|stat.S_IRUSR|stat.S_IFREG, 10, 100, 1, 100, 100, 57344, 1663133777, 1663133777.529757, 1663133777)),
@@ -2386,7 +2388,8 @@ class _TestCases(unittest.TestCase):
 					return orig_open(fname, mode)
 
 				#print('foo:', repr(fname), repr(mode), file=sys.stderr)
-				raise FileNotFoundError
+				if True: #pragma: no cover
+					raise FileNotFoundError
 
 			op.side_effect = open_repl