tests: Drop redundant environment variable

crobinso · crobinso · commit 4a6b004522a9 · 2015-11-19T18:08:42.000-05:00
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -60,11 +60,11 @@ def to_encoding(ustring):
 
     if hasattr(sys.version_info, "major") and sys.version_info.major >= 3:
         return string
-    else:
-        preferred = locale.getpreferredencoding()
-        if "PYTHON_BUGZILLA_TEST_SUITE" in os.environ:
-            preferred = "UTF-8"
-        return string.encode(preferred, 'replace')
+
+    preferred = locale.getpreferredencoding()
+    if _is_unittest:
+        preferred = "UTF-8"
+    return string.encode(preferred, 'replace')
 
 
 def open_without_clobber(name, *args):
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -14,7 +14,6 @@
     from StringIO import StringIO
 
 
-os.environ["PYTHON_BUGZILLA_TEST_SUITE"] = "1"
 _cleanup = []
 
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`from StringIO import StringIO`
`15`	`15`
`16`	`16`
`17`		`-os.environ["PYTHON_BUGZILLA_TEST_SUITE"] = "1"`
`18`	`17`	`_cleanup = []`
`19`	`18`
`20`	`19`