diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /python/testData/testRunner/env/unit/subfolder | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'python/testData/testRunner/env/unit/subfolder')
-rw-r--r-- | python/testData/testRunner/env/unit/subfolder/__init__.py | 1 | ||||
-rw-r--r-- | python/testData/testRunner/env/unit/subfolder/test2.py | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/python/testData/testRunner/env/unit/subfolder/__init__.py b/python/testData/testRunner/env/unit/subfolder/__init__.py new file mode 100644 index 000000000000..595e3818d699 --- /dev/null +++ b/python/testData/testRunner/env/unit/subfolder/__init__.py @@ -0,0 +1 @@ +__author__ = 'traff' diff --git a/python/testData/testRunner/env/unit/subfolder/test2.py b/python/testData/testRunner/env/unit/subfolder/test2.py new file mode 100644 index 000000000000..b2c21b21d674 --- /dev/null +++ b/python/testData/testRunner/env/unit/subfolder/test2.py @@ -0,0 +1,7 @@ +import unittest + +class SubTest(unittest.TestCase): + def test_in_subfolder(self): + self.assertEquals("foo", "fo" + "o") + +
\ No newline at end of file |