[ARVADOS] updated: 301917a75b61cd8a9447b5c525c38dc2e3416c9e
git at public.curoverse.com
git at public.curoverse.com
Wed Sep 24 13:45:07 EDT 2014
Summary of changes:
.../app/assets/javascripts/application.js | 8 +
apps/workbench/app/assets/javascripts/dates.js | 25 +++
.../app/assets/javascripts/pipeline_instances.js | 2 +-
apps/workbench/app/assets/javascripts/tab_panes.js | 130 ++++++++-------
.../app/assets/stylesheets/application.css.scss | 13 ++
.../assets/stylesheets/pipeline_instances.css.scss | 10 ++
.../app/assets/stylesheets/projects.css.scss | 55 +++++++
.../app/controllers/application_controller.rb | 44 ++++-
apps/workbench/app/controllers/jobs_controller.rb | 6 +-
.../controllers/pipeline_instances_controller.rb | 35 +++-
apps/workbench/app/helpers/application_helper.rb | 4 +
apps/workbench/app/helpers/jobs_helper.rb | 1 +
.../app/helpers/pipeline_components_helper.rb | 1 +
.../app/helpers/pipeline_instances_helper.rb | 127 +++++++++++++++
apps/workbench/app/models/job.rb | 28 ++++
.../app/views/application/_content.html.erb | 44 ++---
.../app/views/application/_content_layout.html.erb | 10 +-
.../views/application/_job_status_label.html.erb | 24 ++-
.../application/_pipeline_status_label.html.erb | 2 +
.../app/views/application/_show_advanced.html.erb | 12 +-
.../{show.html.erb => _title_and_buttons.html.erb} | 22 +--
apps/workbench/app/views/application/show.html.erb | 71 +-------
.../collections/_show_source_summary.html.erb | 5 +-
.../workbench/app/views/jobs/_show_status.html.erb | 110 +++----------
apps/workbench/app/views/jobs/show.html.erb | 32 ++++
.../pipeline_instances/_running_component.html.erb | 174 ++++++++++++++++++++
.../pipeline_instances/_show_components.html.erb | 10 +-
.../_show_components_running.html.erb | 139 ++++++++--------
.../pipeline_instances/_show_tab_buttons.html.erb | 40 +++++
.../app/views/pipeline_instances/show.html.erb | 85 ++++++----
.../views/projects/_compute_node_status.html.erb | 61 +++++++
.../views/projects/_compute_node_summary.html.erb | 19 +++
.../app/views/projects/_show_dashboard.html.erb | 179 +++++++++++++++++++++
apps/workbench/app/views/projects/index.html.erb | 85 ++--------
.../pipeline_instances_controller_test.rb | 40 +++++
.../test/integration/application_layout_test.rb | 3 +-
apps/workbench/test/integration/jobs_test.rb | 3 +-
apps/workbench/test/integration/logins_test.rb | 2 +-
.../test/integration/pipeline_instances_test.rb | 18 ++-
.../test/integration/pipeline_templates_test.rb | 3 +-
apps/workbench/test/integration/projects_test.rb | 60 ++++---
.../test/integration/user_profile_test.rb | 5 +-
apps/workbench/test/test_helper.rb | 49 ++----
sdk/cli/Gemfile.lock | 32 ++--
sdk/cli/README.textile | 11 --
sdk/cli/arvados-cli.gemspec | 14 +-
sdk/python/bin/arv-get | 6 +-
sdk/ruby/arvados.gemspec | 18 +--
.../app/controllers/arvados/v1/jobs_controller.rb | 3 +-
services/api/app/models/job.rb | 130 ++++++---------
services/api/app/models/node.rb | 1 +
.../db/migrate/20140918153705_add_state_to_job.rb | 23 ++-
services/api/test/fixtures/nodes.yml | 33 +++-
services/api/test/test_helper.rb | 49 ++----
services/api/test/unit/job_test.rb | 49 +++---
services/api/test/unit/node_test.rb | 6 +
services/keepstore/handlers.go | 18 ++-
57 files changed, 1435 insertions(+), 754 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/dates.js
copy apps/workbench/app/views/application/{show.html.erb => _title_and_buttons.html.erb} (76%)
create mode 100644 apps/workbench/app/views/jobs/show.html.erb
create mode 100644 apps/workbench/app/views/pipeline_instances/_running_component.html.erb
create mode 100644 apps/workbench/app/views/pipeline_instances/_show_tab_buttons.html.erb
create mode 100644 apps/workbench/app/views/projects/_compute_node_status.html.erb
create mode 100644 apps/workbench/app/views/projects/_compute_node_summary.html.erb
create mode 100644 apps/workbench/app/views/projects/_show_dashboard.html.erb
create mode 100644 apps/workbench/test/controllers/pipeline_instances_controller_test.rb
delete mode 100644 sdk/cli/README.textile
via 301917a75b61cd8a9447b5c525c38dc2e3416c9e (commit)
via 2b0a7c3f635bc2340956d670c6aeda417dd11cec (commit)
via 8716b38d3cd20640c28b6fe048927309a0f916cd (commit)
via 5fd423a57ab1f34162f4cb2c08bd6b0b2515af40 (commit)
via 06a956718e8dd55a2cdd4a84fcdfb7a3b5a0f635 (commit)
via 8c97b8ad6f4b026f8bd2626a6d1b76d2fc60f253 (commit)
via b25e164d6cfc0712be5856c63f7592145669232d (commit)
via 9c7058321b88320594fccec767a8326e0bb9db4f (commit)
via 92211c8bed5aaf3abd83d02c4adbaf2329123bac (commit)
via 1d5d09e8d1568fdae039571306bd5e56a8273ac7 (commit)
via eec77d22e408fe3983cba666c6f5185ecf2d15ec (commit)
via 4ea6cda50c7fcd3d30ac01e8a421cc68cd4ea23d (commit)
via 5ef678825d7b436526489e9158a916b605814133 (commit)
via d2517f46eb0d1a668ac8124144220436c80d6f65 (commit)
via 240ab2c50a01531df162850be255a4c4e1084fc2 (commit)
via 3e3df723e221dadf2512ac4935c1f6f0fe8f7834 (commit)
via d23d4ce9e4c52605cb23286b9e9b46a808f7437d (commit)
via 5af4f00db1cbac83f52bf02b424968fd0ef387b1 (commit)
via 1fc256cee80eef7aa2178789f23a729ba9f27b79 (commit)
via d6478bb286c0bb1e7b8af67fb4800db792200022 (commit)
via 22c7912d7c62877647fc714cd0bbef8f37a2b120 (commit)
via 5b2a15b6a4addfc648ef1060be47ffef64e64777 (commit)
via d70e5d076e907266c0f40364aaa69fdce449ce9f (commit)
via 7e27eb2cca7e9e22ad1f56a6f0ecbbc40ad4cb64 (commit)
via 104244f9ab68f409dbad2272910c21e317994a5d (commit)
via 2e8aee62b13edd8eac34ac8536d41992c7adbf69 (commit)
via 80ec2c7fe823b84ba5b3533f3c43d1bf3c627f70 (commit)
via 96e711607984bd74a682dd3f3819dbc453a6591b (commit)
via 6fcb589fc76b9251a142dd76d3019c993cfcd71c (commit)
via 59607e4635868117051d77aa4a84fa9f689c52e7 (commit)
via aecc7109edd37aee2388c06a36d5c8ba853b3267 (commit)
via ccff8ce154b393512dd4b563853f63a9abeefba4 (commit)
via 4eaf39dbe947beaaa87e656b470d7f21880ba607 (commit)
via 148306afed19fc9138a04bcf161d8f24d83b2ac0 (commit)
via f9a2ed53565bf921821dff5e2120b6496ac9acdd (commit)
via c446dd845656e944c2d3f91f8d00e320c37b66a1 (commit)
via 15409c5e2b7946ff7f5fd104a6757a4d874448d4 (commit)
via c24d0cc28ee40a37d7f0ead787394765386e5413 (commit)
via 95723281b6a2b9d594f92cc5577c2f41e08338df (commit)
via b96a5d949f88fa4f11570ffdf3b951602a3ea4aa (commit)
via ba46f409f9c572263cb7907eb2f36139a2c0320b (commit)
via bbb726b1c675cff7ef34704ecfa05353f971e951 (commit)
via fb9235f1b9abe0661eb7640c4db0ab7001f90f1d (commit)
via 1ccabc86f9eb3b51e02a3571d5b133fec8258f49 (commit)
via ed413bb7071fe0d58a98828e89be21fef5681200 (commit)
via 44d97727200a7efecd115cd01fb520f371ebfe3b (commit)
via 40b15ddcdcb8314f0a1036de6238d0ca4bfb3e41 (commit)
via 7178ac911e7b160c1348da404b5aa07b9829d3c8 (commit)
via 5be834f3ac1bdd81f2c40514cdb5795a8585e1f6 (commit)
via a6809bec920bdfdfc03c726d0808e696824289f5 (commit)
via b522f728ae1674c9b9bcee189885d919e91acccf (commit)
via 5a3b04f7177afe202ab4f8776b5ca2567b4fdabe (commit)
via c51634cad3c68d0a8400f1b1c47da9eef5307e06 (commit)
via a3f380f9dfe25c1c28e6354de56d93b5c9265a08 (commit)
via 9e2357191ca21631bcb6d8cf7a640d456a1a6cfa (commit)
via 0d1919c4b29f66c9af5a912f770dccce4a314e5f (commit)
via 886d7eef0316bfb5bb230db66ec90123a28315f6 (commit)
via bff8478af0503196b18446f8b909949b618e363f (commit)
via 07a3aa9651168756a6f108821f6ef10ea4ba8144 (commit)
via 195b1b9f5b683110b4cef2ebd4e7cc3401317334 (commit)
via 177a1468e06674e7ff0ff0730b8607fbbd78000b (commit)
via f91bae113a348bb049f6391043f8ba9529def694 (commit)
via dcf5e0cef46e3aa3baba27da3f922b1c357ba3f3 (commit)
via 90ecfcca3bcfd82b91d396c271e19698ae970715 (commit)
via 63b52a3a8d2fb55bd6aa0386e7d86851915be5af (commit)
via 8b9f3b877a6aa7ed81db48f83f3feb5ef4388164 (commit)
via 004e528060e42b45c8207e43892289b14f5aa2e5 (commit)
via 6386f2aca83b477210bda19a3284ea31463d2efc (commit)
via 9be9761666fd091496bee885b37598db9a6ab38a (commit)
via a0fc519db4f3664366c356d21a8478495f2ae78b (commit)
via 08b9ee71323c22fb04c183b09991ca3e6db712fd (commit)
via aadca3ff41a12a7a52a2a072696564b90537b9b3 (commit)
via 0313c6ef5ac52fc483718690b1a5902ad1c11e16 (commit)
from 768889aad2bf97586d68b52af4f2b9ccae78251e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 301917a75b61cd8a9447b5c525c38dc2e3416c9e
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 24 13:44:23 2014 -0400
3889: update test_helper.rb with Tom's updates.
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index cb3be10..c6ef706 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -153,45 +153,28 @@ class ApiServerForTests
end
class ActionController::TestCase
- def reset_counter
- $counter = 0
+ setup do
+ @counter = 0
end
def check_counter action
- $counter += 1
- if $counter > 1
- raise "Too many actions on a single instance of ActionController::TestCase #{action}"
+ @counter += 1
+ if @counter == 2
+ # TODO: when existing mistakes are fixed, start failing broken
+ # test cases like this:
+ #
+ # assert_equal 1, 2, "Multiple actions in functional test"
+ #
+ # Meanwhile, just warn (just once per test case):
+ $stderr.puts " [WARNING: Multiple actions in functional test]"
end
end
- alias original_run_callbacks run_callbacks
- def run_callbacks(kind, &block)
- reset_counter
- original_run_callbacks(kind, &block)
- end
-
- alias original_get get
- def get(action, *args)
- check_counter action
- original_get(action, *args)
- end
-
- alias original_post post
- def post(action, *args)
- check_counter action
- original_post(action, *args)
- end
-
- alias original_put put
- def put(action, *args)
- check_counter action
- original_put(action, *args)
- end
-
- alias original_delete delete
- def delete(action, *args)
- check_counter action
- original_delete(action, *args)
+ [:get, :post, :put, :patch, :delete].each do |method|
+ define_method method do |action, *args|
+ check_counter action
+ super action, *args
+ end
end
end
commit 2b0a7c3f635bc2340956d670c6aeda417dd11cec
Merge: 8716b38 5fd423a
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 24 13:28:22 2014 -0400
Merge branch '3889-functional-testing-TC' into 3889-functional-testing
commit 8716b38d3cd20640c28b6fe048927309a0f916cd
Merge: 768889a 06a9567
Author: radhika <radhika at curoverse.com>
Date: Wed Sep 24 13:24:30 2014 -0400
Merge branch 'master' into 3889-functional-testing
commit 5fd423a57ab1f34162f4cb2c08bd6b0b2515af40
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Sep 24 11:41:24 2014 -0400
3889: Clean up counter checks. For now, warn instead of failing.
diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 23bd901..996d916 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -81,45 +81,28 @@ class ActiveSupport::TestCase
end
class ActionController::TestCase
- def reset_counter
- $counter = 0
+ setup do
+ @counter = 0
end
def check_counter action
- $counter += 1
- if $counter > 1
- raise "Too many actions on a single instance of ActionController::TestCase #{action}"
+ @counter += 1
+ if @counter == 2
+ # TODO: when existing mistakes are fixed, start failing broken
+ # test cases like this:
+ #
+ # assert_equal 1, 2, "Multiple actions in functional test"
+ #
+ # Meanwhile, just warn (just once per test case):
+ $stderr.puts " [WARNING: Multiple actions in functional test]"
end
end
- alias original_run_callbacks run_callbacks
- def run_callbacks(kind, &block)
- reset_counter
- original_run_callbacks(kind, &block)
- end
-
- alias original_get get
- def get(action, *args)
- check_counter action
- original_get(action, *args)
- end
-
- alias original_post post
- def post(action, *args)
- check_counter action
- original_post(action, *args)
- end
-
- alias original_put put
- def put(action, *args)
- check_counter action
- original_put(action, *args)
- end
-
- alias original_delete delete
- def delete(action, *args)
- check_counter action
- original_delete(action, *args)
+ [:get, :post, :put, :patch, :delete].each do |method|
+ define_method method do |action, *args|
+ check_counter action
+ super action, *args
+ end
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list