Merge pull request #298 from lsst/tickets/DM-26671

DM-26671: Support click 7.0 and 7.1 in unit tests
lsst · Sep 14, 2020 · 887e66a · 887e66a
2 parents db8d150 + 20202ea
commit 887e66a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/tests/test_cliCmdConvert.py b/tests/test_cliCmdConvert.py
@@ -72,8 +72,8 @@ def test_all(self):
 
     def test_missing(self):
         """test a missing argument"""
-        self.run_missing(["convert"], 'Missing argument "REPO"')
-        self.run_missing(["convert", "here"], 'Missing option "--gen2root"')
+        self.run_missing(["convert"], "Missing argument ['\"]REPO['\"]")
+        self.run_missing(["convert", "here"], "Missing option ['\"]--gen2root['\"]")
 
 
 if __name__ == "__main__":

diff --git a/tests/test_cliCmdDefineVisits.py b/tests/test_cliCmdDefineVisits.py
@@ -64,8 +64,8 @@ def test_all(self):
 
     def test_missing(self):
         """test a missing argument"""
-        self.run_missing(["define-visits"], 'Missing argument "REPO"')
-        self.run_missing(["define-visits", "here"], 'Missing option "-i" / "--instrument"')
+        self.run_missing(["define-visits"], "Missing argument ['\"]REPO['\"]")
+        self.run_missing(["define-visits", "here"], "Missing option ['\"]-i['\"] / ['\"]--instrument['\"]")
 
 
 if __name__ == "__main__":

diff --git a/tests/test_cliCmdRegisterInstrument.py b/tests/test_cliCmdRegisterInstrument.py
@@ -46,8 +46,8 @@ def test_repoBasic(self):
 
     def test_missing(self):
         """test a missing argument"""
-        self.run_missing(["register-instrument"], 'Missing argument "REPO"')
-        self.run_missing(["register-instrument", "here"], 'Missing argument "INSTRUMENT ..."')
+        self.run_missing(["register-instrument"], "Missing argument ['\"]REPO['\"]")
+        self.run_missing(["register-instrument", "here"], "Missing argument ['\"]INSTRUMENT ...['\"]")
 
 
 if __name__ == "__main__":

diff --git a/tests/test_cliCmdWriteCuratedCalibrations.py b/tests/test_cliCmdWriteCuratedCalibrations.py
@@ -49,8 +49,10 @@ def test_repoBasic(self):
 
     def test_missing(self):
         """test a missing argument"""
-        self.run_missing(["write-curated-calibrations"], 'Missing argument "REPO"')
-        self.run_missing(["write-curated-calibrations", "here"], 'Missing option "-i" / "--instrument"')
+        self.run_missing(["write-curated-calibrations"], "Missing argument ['\"]REPO['\"]")
+        self.run_missing(
+            ["write-curated-calibrations", "here"], "Missing option ['\"]-i['\"] / ['\"]--instrument['\"]"
+        )
 
 
 if __name__ == "__main__":