diff options
| author | Austin Henriksen <austin@zeroc.com> | 2020-02-10 14:23:15 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2023-12-07 11:13:02 -0500 |
| commit | 0d709b71c85fde11b44fb83d19d57b2b1d81ee2a (patch) | |
| tree | 963c94fedc966b12a7c085be3731fc6c5f9516a4 | |
| parent | Fix indentation (diff) | |
| download | ice-0d709b71c85fde11b44fb83d19d57b2b1d81ee2a.tar.bz2 ice-0d709b71c85fde11b44fb83d19d57b2b1d81ee2a.tar.xz ice-0d709b71c85fde11b44fb83d19d57b2b1d81ee2a.zip | |
Fixes #708.
(cherry picked from commit e72ec310aba8a19ffb2655091be75b7bd2e6e371)
| -rw-r--r-- | cpp/test/IceGrid/admin/test.py | 8 | ||||
| -rw-r--r-- | cpp/test/Slice/headers/test.py | 8 | ||||
| -rw-r--r-- | scripts/Util.py | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/cpp/test/IceGrid/admin/test.py b/cpp/test/IceGrid/admin/test.py index 593b2a8e934..287a643e0eb 100644 --- a/cpp/test/IceGrid/admin/test.py +++ b/cpp/test/IceGrid/admin/test.py @@ -71,10 +71,10 @@ class IceGridAdminTestCase(IceGridTestCase): expect(admin, 'Test') admin.sendline(current, 'application describe Test') expect(admin, 'application `Test\'') - expect(admin, '\{.*\}') + expect(admin, '\\{.*\\}') expect(admin, '>>> ') admin.sendline(current, 'application diff application.xml server.dir=%s' % serverDir) - expect(admin, 'application `Test\'\n\{.*\}') + expect(admin, 'application `Test\'\n\\{.*\\}') expect(admin, '>>> ') admin.sendline(current, 'application update application.xml server.dir=%s' % serverDir) expect(admin, '>>> ') @@ -84,12 +84,12 @@ class IceGridAdminTestCase(IceGridTestCase): expect(admin, 'server') expect(admin, '>>> ') admin.sendline(current, 'server describe server') - expect(admin, 'server `server\'\n\{.*\}') + expect(admin, 'server `server\'\n\\{.*\\}') expect(admin, '>>> ') admin.sendline(current, 'server start server') expect(admin, '>>> ') admin.sendline(current, 'server state server') - expect(admin, '^active \(.*\)') + expect(admin, '^active \\(.*\\)') expect(admin, '>>> ') admin.sendline(current, 'server pid server') expect(admin, '[0-9]+') diff --git a/cpp/test/Slice/headers/test.py b/cpp/test/Slice/headers/test.py index 7b66e895638..938fcb65a9e 100644 --- a/cpp/test/Slice/headers/test.py +++ b/cpp/test/Slice/headers/test.py @@ -24,10 +24,10 @@ class SliceHeadersTestCase(ClientTestCase): def runTest(args): slice2cpp.run(current, args=args.split(" ")) f = open("b.h") - if not re.search('#include <dir1\/a1\.h>\n' - '#include <linktodir1\/a2\.h>\n' - '#include <linktodir1\/linktoa3\.h>\n' - '#include <Ice\/Identity\.h>\n', f.read(), re.S): + if not re.search(r'#include <dir1\/a1\.h>\n' + r'#include <linktodir1\/a2\.h>\n' + r'#include <linktodir1\/linktoa3\.h>\n' + r'#include <Ice\/Identity\.h>\n', f.read(), re.S): raise RuntimeError("failed!") os.unlink("b.h") diff --git a/scripts/Util.py b/scripts/Util.py index 0af3ee081d8..1801fd692e7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -243,7 +243,7 @@ class Platform(object): def hasSwift(self, version): if self._hasSwift is None: try: - m = re.search("Apple Swift version ([0-9]+\.[0-9]+)", run("swift --version")) + m = re.search(r"Apple Swift version ([0-9]+\.[0-9]+)", run("swift --version")) if m and m.group(1): self._hasSwift = tuple([int(n) for n in m.group(1).split(".")]) >= version else: @@ -3842,7 +3842,7 @@ class SwiftMapping(Mapping): "macOS", current.config.buildConfig) - targetBuildDir = re.search("\sTARGET_BUILD_DIR = (.*)", run(cmd)).groups(1)[0] + targetBuildDir = re.search(r"\sTARGET_BUILD_DIR = (.*)", run(cmd)).groups(1)[0] testDriver = os.path.join(targetBuildDir, "TestDriver.app/Contents/MacOS/TestDriver") if not os.path.exists(testDriver): |