Michael Merickel
2018-10-15 81576ee51564c49d5ff3c1c07f214f22a8438231
tests/test_asset.py
File was renamed from pyramid/tests/test_asset.py
@@ -14,14 +14,14 @@
        self.assertEqual(package_name, None)
    def test_rel_spec(self):
        pkg = 'pyramid.tests'
        pkg = 'tests'
        path = 'test_asset.py'
        package_name, filename = self._callFUT(path, pkg)
        self.assertEqual(package_name, 'pyramid.tests')
        self.assertEqual(package_name, 'tests')
        self.assertEqual(filename, 'test_asset.py')
        
    def test_abs_spec(self):
        pkg = 'pyramid.tests'
        pkg = 'tests'
        path = 'pyramid.nottests:test_asset.py'
        package_name, filename = self._callFUT(path, pkg)
        self.assertEqual(package_name, 'pyramid.nottests')
@@ -35,11 +35,11 @@
        self.assertEqual(filename, 'test_asset.py')
    def test_package_name_is_package_object(self):
        import pyramid.tests
        pkg = pyramid.tests
        import tests
        pkg = tests
        path = 'test_asset.py'
        package_name, filename = self._callFUT(path, pkg)
        self.assertEqual(package_name, 'pyramid.tests')
        self.assertEqual(package_name, 'tests')
        self.assertEqual(filename, 'test_asset.py')
@@ -57,7 +57,7 @@
        self.assertEqual(result, '/abc')
    def test_pkgrelative(self):
        result = self._callFUT('abc', 'pyramid.tests')
        result = self._callFUT('abc', 'tests')
        self.assertEqual(result, os.path.join(here, 'abc'))
class Test_asset_spec_from_abspath(unittest.TestCase):
@@ -72,13 +72,13 @@
    def test_abspath_startswith_package_path(self):
        abspath = os.path.join(here, 'fixtureapp')
        pkg = DummyPackage('pyramid.tests')
        pkg = DummyPackage('tests')
        pkg.__file__ = 'file'
        result = self._callFUT(abspath, pkg)
        self.assertEqual(result, 'pyramid:fixtureapp')
        self.assertEqual(result, 'tests:fixtureapp')
    def test_abspath_doesnt_startwith_package_path(self):
        pkg = DummyPackage('pyramid.tests')
        pkg = DummyPackage('tests')
        result = self._callFUT(here, pkg)
        self.assertEqual(result, here)