You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wi...@apache.org on 2014/01/10 22:45:58 UTC

git commit: Fix TaskPath import in thermos binary

Updated Branches:
  refs/heads/master 7e87588c1 -> c98b3a537


Fix TaskPath import in thermos binary

Testing Done:
[tw-172-25-27-94 aurora (jsmith/wat)]$ ./pants ./src/test/python/apache/thermos/bin:all
Build operating on targets: OrderedSet([PythonTestSuite(src/test/python/apache/thermos/bin/BUILD:all)])
=============================================================== test session starts ================================================================
platform darwin -- Python 2.7.3 -- pytest-2.5.1
collected 0 items / 1 errors

====================================================================== ERRORS ======================================================================
_______________________________________ ERROR collecting src/test/python/apache/thermos/bin/test_thermos.py ________________________________________
src/test/python/apache/thermos/bin/test_thermos.py:1: in <module>
>   from apache.thermos.bin import thermos
/var/folders/kk/_7jrv7jd0095tg5x9w1qd8mw0000gp/T/tmpIWqDim/apache/thermos/bin/thermos.py:21: in <module>
>   from apache.thermos.common.path import TkPath
E   ImportError: cannot import name TkPath
============================================================= 1 error in 0.09 seconds ==============================================================
src.test.python.apache.thermos.bin.test_thermos                                 .....   FAILURE

# updated import statement

[tw-172-25-27-94 aurora (jsmith/wat)]$ ./pants ./src/test/python/apache/thermos/bin:all
Build operating on targets: OrderedSet([PythonTestSuite(src/test/python/apache/thermos/bin/BUILD:all)])
=============================================================== test session starts ================================================================
platform darwin -- Python 2.7.3 -- pytest-2.5.1
collected 0 items

=================================================================  in 0.15 seconds =================================================================
src.test.python.apache.thermos.bin.test_thermos                                 .....   SUCCESS

Bugs closed: AURORA-26

Reviewed at https://reviews.apache.org/r/16762/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/c98b3a53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/c98b3a53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/c98b3a53

Branch: refs/heads/master
Commit: c98b3a537333bd0ee3965a412d026824165f2d4c
Parents: 7e87588
Author: Joe Smith <ya...@gmail.com>
Authored: Fri Jan 10 13:45:10 2014 -0800
Committer: Brian Wickman <wi...@twitter.com>
Committed: Fri Jan 10 13:45:10 2014 -0800

----------------------------------------------------------------------
 src/main/python/apache/thermos/bin/thermos.py    |  2 +-
 src/test/python/apache/thermos/BUILD             |  1 +
 src/test/python/apache/thermos/bin/BUILD         | 19 +++++++++++++++++++
 .../python/apache/thermos/bin/test_thermos.py    |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c98b3a53/src/main/python/apache/thermos/bin/thermos.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/thermos/bin/thermos.py b/src/main/python/apache/thermos/bin/thermos.py
index 334297a..5e6f556 100644
--- a/src/main/python/apache/thermos/bin/thermos.py
+++ b/src/main/python/apache/thermos/bin/thermos.py
@@ -18,7 +18,7 @@ from twitter.common.dirutil.tail import tail as tail_closed
 from twitter.common.quantity import Amount, Time, Data
 from twitter.common.quantity.parse_simple import parse_time, parse_data
 from twitter.common.recordio import RecordIO, ThriftRecordReader
-from apache.thermos.common.path import TkPath
+from apache.thermos.common.path import TaskPath
 from apache.thermos.common.ckpt import CheckpointDispatcher
 from apache.thermos.common.options import add_port_to, add_binding_to
 from apache.thermos.config.loader import ThermosConfigLoader, ThermosTaskWrapper

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c98b3a53/src/test/python/apache/thermos/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/BUILD b/src/test/python/apache/thermos/BUILD
index 38c2f4b..49add5e 100644
--- a/src/test/python/apache/thermos/BUILD
+++ b/src/test/python/apache/thermos/BUILD
@@ -1,6 +1,7 @@
 python_test_suite(
   name = 'all',
   dependencies = [
+    pants('src/test/python/apache/thermos/bin:all'),
     pants('src/test/python/apache/thermos/common:all'),
     pants('src/test/python/apache/thermos/config:all'),
     pants('src/test/python/apache/thermos/core:all'),

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c98b3a53/src/test/python/apache/thermos/bin/BUILD
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/bin/BUILD b/src/test/python/apache/thermos/bin/BUILD
new file mode 100644
index 0000000..0390703
--- /dev/null
+++ b/src/test/python/apache/thermos/bin/BUILD
@@ -0,0 +1,19 @@
+python_test_suite(name = 'all',
+  dependencies = [
+    pants(':small'),
+  ]
+)
+
+python_test_suite(name = 'small',
+  dependencies = [
+    pants(':test_thermos'),
+  ]
+)
+
+python_tests(name = 'test_thermos',
+  sources = ['test_thermos.py'],
+  dependencies = [
+     pants('src/main/python/apache/thermos/bin:thermos'),
+     pants('src/main/python/apache/thermos/testing:runner'),
+  ]
+)

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/c98b3a53/src/test/python/apache/thermos/bin/test_thermos.py
----------------------------------------------------------------------
diff --git a/src/test/python/apache/thermos/bin/test_thermos.py b/src/test/python/apache/thermos/bin/test_thermos.py
new file mode 100644
index 0000000..889c098
--- /dev/null
+++ b/src/test/python/apache/thermos/bin/test_thermos.py
@@ -0,0 +1 @@
+from apache.thermos.bin import thermos