projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21721-refresh-python-deps'
[arvados.git]
/
sdk
/
cwl
/
tests
/
test_urljoin.py
diff --git
a/sdk/cwl/tests/test_urljoin.py
b/sdk/cwl/tests/test_urljoin.py
index 948f31d4f9815f3deadf595c1f5cbd3e1a464c29..08bca55e3dc8aefba0963259759a4055df8a84d6 100644
(file)
--- a/
sdk/cwl/tests/test_urljoin.py
+++ b/
sdk/cwl/tests/test_urljoin.py
@@
-3,13
+3,14
@@
# SPDX-License-Identifier: Apache-2.0
import functools
# SPDX-License-Identifier: Apache-2.0
import functools
-import mock
import sys
import unittest
import json
import logging
import os
import sys
import unittest
import json
import logging
import os
+from unittest import mock
+
import arvados
import arvados.keep
import arvados.collection
import arvados
import arvados.keep
import arvados.collection
@@
-23,37
+24,37
@@
class TestUrljoin(unittest.TestCase):
cf = CollectionFetcher({}, None)
cf = CollectionFetcher({}, None)
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/hw.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/hw.py",
cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py"))
cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/hw.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/hw.py",
cf.urljoin("keep:99999999999999999999999999999991+99/", "hw.py"))
cf.urljoin("keep:99999999999999999999999999999991+99/", "hw.py"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/hw.py#main",
+ self.assertEqual("keep:99999999999999999999999999999991+99/hw.py#main",
cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py#main"))
cf.urljoin("keep:99999999999999999999999999999991+99", "hw.py#main"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/hw.py#main",
+ self.assertEqual("keep:99999999999999999999999999999991+99/hw.py#main",
cf.urljoin("keep:99999999999999999999999999999991+99/hw.py", "#main"))
cf.urljoin("keep:99999999999999999999999999999991+99/hw.py", "#main"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/dir/hw.py#main",
+ self.assertEqual("keep:99999999999999999999999999999991+99/dir/hw.py#main",
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "#main"))
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "#main"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/dir/wh.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/dir/wh.py",
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "wh.py"))
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "wh.py"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/wh.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/wh.py",
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py"))
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/wh.py#main",
+ self.assertEqual("keep:99999999999999999999999999999991+99/wh.py#main",
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py#main"))
cf.urljoin("keep:99999999999999999999999999999991+99/dir/hw.py", "/wh.py#main"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/wh.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/wh.py",
cf.urljoin("keep:99999999999999999999999999999991+99/hw.py#main", "wh.py"))
cf.urljoin("keep:99999999999999999999999999999991+99/hw.py#main", "wh.py"))
- self.assertEqual
s
("keep:99999999999999999999999999999992+99",
+ self.assertEqual("keep:99999999999999999999999999999992+99",
cf.urljoin("keep:99999999999999999999999999999991+99", "keep:99999999999999999999999999999992+99"))
cf.urljoin("keep:99999999999999999999999999999991+99", "keep:99999999999999999999999999999992+99"))
- self.assertEqual
s
("keep:99999999999999999999999999999991+99/dir/wh.py",
+ self.assertEqual("keep:99999999999999999999999999999991+99/dir/wh.py",
cf.urljoin("keep:99999999999999999999999999999991+99/dir/", "wh.py"))
def test_resolver(self):
cf.urljoin("keep:99999999999999999999999999999991+99/dir/", "wh.py"))
def test_resolver(self):