fix outstanding test failures

Change-Id: I9a5cb8ee8d185a360304515a4e8da529ffb85292

edx/analytics/tasks/reports/tests/test_total_enrollments.py

@@ -4,7 +4,6 @@ from contextlib import contextmanager
 import datetime
 import textwrap
 from StringIO import StringIO
-from unittest import TestCase
 
 import luigi
 import luigi.hdfs
@@ -13,7 +12,7 @@ from numpy import isnan
 import pandas
 
 from edx.analytics.tasks.reports.total_enrollments import TotalUsersAndEnrollmentsByWeek, TOTAL_ENROLLMENT_ROWNAME
-
+from edx.analytics.tasks.tests import unittest
 
 class FakeTarget(object):
     """
@@ -33,7 +32,7 @@ class FakeTarget(object):
         self.buffer.seek(0)
 
 
-class TestTotalUsersAndEnrollmentsByWeek(TestCase):
+class TestTotalUsersAndEnrollmentsByWeek(unittest.TestCase):
     """Tests for TotalUsersAndEnrollmentsByWeek class."""
 
     def run_task(self, source, date, weeks, offset=None, history=None):

edx/analytics/tasks/tests/test_url.py

@@ -68,10 +68,6 @@ class UrlPathJoinTestCase(unittest.TestCase):
     def test_extra_separators(self):
         self.assertEquals(url.url_path_join('s3://foo/bar', '///baz'), 's3://foo///baz')
 
-    @unittest.skip("Failing in Python 2.6 due to differences in urlparse")
-    def test_query_string(self):
-        self.assertEquals(url.url_path_join('s3://foo/bar?x=y', 'baz'), 's3://foo/bar/baz?x=y')
-
     def test_multiple_elements(self):
         self.assertEquals(url.url_path_join('s3://foo', 'bar', 'baz'), 's3://foo/bar/baz')
         self.assertEquals(url.url_path_join('s3://foo', 'bar/bing', 'baz'), 's3://foo/bar/bing/baz')