From 0d4437a404e27cbaf648eeadb8a690c9852e795d Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 4 Jun 2016 18:28:03 +0530 Subject: Fix function name typo --- test/pathod/test_language_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pathod/test_language_base.py b/test/pathod/test_language_base.py index 47e51bb0..a3e3935b 100644 --- a/test/pathod/test_language_base.py +++ b/test/pathod/test_language_base.py @@ -38,7 +38,7 @@ class TestTokValueNakedLiteral: class TestTokValueLiteral: - def test_espr(self): + def test_expr(self): v = base.TokValueLiteral("foo") assert v.expr() assert v.val == b"foo" -- cgit v1.2.3 From 6ffe8b376e2ba47a21bc52c03c6cb3183844025d Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 4 Jun 2016 18:28:50 +0530 Subject: Py3: Write bytes to file --- test/pathod/test_language_base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/pathod/test_language_base.py b/test/pathod/test_language_base.py index a3e3935b..075dc2b8 100644 --- a/test/pathod/test_language_base.py +++ b/test/pathod/test_language_base.py @@ -132,7 +132,7 @@ class TestTokValueFile: with tutils.tmpdir() as t: p = os.path.join(t, "path") with open(p, "wb") as f: - f.write("x" * 10000) + f.write(b"x" * 10000) assert v.get_generator(language.Settings(staticdir=t)) @@ -207,13 +207,13 @@ class TestMisc: p = os.path.join(t, "path") s = base.Settings(staticdir=t) with open(p, "wb") as f: - f.write("a" * 20) + f.write(b"a" * 20) v = e.parseString("m Date: Sat, 4 Jun 2016 18:31:26 +0530 Subject: Py3: Return path unescaped [skip appveyor] --- pathod/language/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pathod/language/base.py b/pathod/language/base.py index 11ee0623..1369a3c7 100644 --- a/pathod/language/base.py +++ b/pathod/language/base.py @@ -226,7 +226,7 @@ class TokValueFile(Token): return generators.FileGenerator(s) def spec(self): - return "<'%s'" % strutils.bytes_to_escaped_str(self.path) + return "<'%s'" % self.path TokValue = pp.MatchFirst( -- cgit v1.2.3 From 1de379be9568f5d7d762b18abc3549588987bf4f Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 4 Jun 2016 18:32:37 +0530 Subject: Enable Travis for test/pathod/test_language_base --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdfb4655..5f065d53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ matrix: git: depth: 9999999 - python: 3.5 - env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py" + env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py" - python: 3.5 - env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py" NO_ALPN=1 + env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py" NO_ALPN=1 - python: 2.7 env: DOCS=1 script: 'cd docs && make html' -- cgit v1.2.3 From f45765a236f058a9d1eece7e5a5216e6fbcdecbe Mon Sep 17 00:00:00 2001 From: Shadab Zafar Date: Sat, 4 Jun 2016 19:07:28 +0530 Subject: Add test_language_base to tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b01de128..f94dfb49 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ deps = -rrequirements.txt commands = py.test -n 8 --timeout 60 ./test [testenv:py35] -commands = py.test -n 8 --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py +commands = py.test -n 8 --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py [testenv:lint] deps = flake8 -- cgit v1.2.3