Update test_sysargv

vmuriart · vmuriart · commit 012b488af1a5 · 2017-02-24T08:13:08.000-07:00
Previous version didn't test correctly
diff --git a/src/tests/_compat.py b/src/tests/_compat.py
@@ -6,6 +6,7 @@
 """
 
 import operator
+import subprocess
 import sys
 import types
 
@@ -63,3 +64,11 @@
     map = imap
     range = xrange
     zip = izip
+
+
+def check_output(*args, **kwargs):
+    """Check output wrapper for PY2/PY3 compatibility"""
+    output = subprocess.check_output(*args, **kwargs)
+    if PY2:
+        return output
+    return output.decode("ascii")
diff --git a/src/tests/conftest.py b/src/tests/conftest.py
@@ -9,12 +9,13 @@
 import sys
 import sysconfig
 
+import pytest
 import clr
 
 # Add path for `Python.Test`
 cwd = os.path.dirname(__file__)
-fixtures = os.path.join(cwd, 'fixtures')
-sys.path.append(fixtures)
+fixtures_path = os.path.join(cwd, "fixtures")
+sys.path.append(fixtures_path)
 
 # Add References for tests
 clr.AddReference("Python.Test")
@@ -34,3 +35,14 @@ def pytest_report_header(config):
     header = ("Arch: {arch}, UCS: {ucs}, LIBDIR: {libdir}, "
               "Py_ENABLE_SHARED: {shared}".format(**locals()))
     return header
+
+
+@pytest.fixture()
+def filepath():
+    """Returns full filepath for file in `fixtures` directory."""
+
+    def make_filepath(filename):
+        # http://stackoverflow.com/questions/18011902/parameter-to-a-fixture
+        return os.path.join(fixtures_path, filename)
+
+    return make_filepath
diff --git a/src/tests/fixtures/argv-fixture.py b/src/tests/fixtures/argv-fixture.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+"""Helper script to test argv.
+Ensures that argv isn't modified after importing clr.
+For more details see GH#404 - argv not found"""
+
+from __future__ import print_function
+
+import sys
+import clr
+
+print(sys.argv)
diff --git a/src/tests/test_sysargv.py b/src/tests/test_sysargv.py
@@ -4,9 +4,18 @@
 
 import sys
 
+import pytest
 
-def test_sys_argv_state():
-    """Test sys.argv state doesn't change after clr import."""
-    argv = sys.argv
-    import clr
-    assert argv == sys.argv
+from ._compat import check_output
+
+
+@pytest.mark.xfail(reason="argv being reset on import clr. See gh#404")
+def test_sys_argv_state(filepath):
+    """Test sys.argv state doesn't change after clr import.
+    To better control the arguments being passed, test on a fresh python
+    instance with specific arguments"""
+
+    script = filepath("argv-fixture.py")
+    out = check_output([sys.executable, script, "foo", "bar"])
+    assert "foo" in out
+    assert "bar" in out
