Cleanup and update documentation to mention form.json by eousphoros · Pull Request #47 · brightroll/rq

eousphoros · 2014-02-11T07:05:03Z

root@base:/home/ubuntu/git/rq# ./bin/rq-install
Created queue {"name"=>"relay", "script"=>"./code/relay_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"webhook", "script"=>"./code/webhook_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"cleaner", "script"=>"./code/cleaner_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"rq_router", "script"=>"./code/rq_router_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
root@base:/home/ubuntu/git/rq# ./test/run_tests.sh
Created queue {"name"=>"relay", "script"=>"./code/relay_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"webhook", "script"=>"./code/webhook_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"cleaner", "script"=>"./code/cleaner_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Created queue {"name"=>"rq_router", "script"=>"./code/rq_router_script.rb", "num_workers"=>"1", "exec_prefix"=>""}
Running ./test/setup_test_queues.sh
Checking that system is ready for install...
Checking that system is operational...
Creating the test queue...
Creating the test symlink queue...
Creating the test coalesce queue...
Creating the test run queue...
Creating the test nop queue...
Creating the ansi test queue...
Creating the test_env_var test queue...
rm: cannot remove ‘_install.txt’: No such file or directory
ALL DONE SUCCESSFULLY
Running ./test/test_queues_setup.rb
3040 - 2014-02-11 06:56:11 +0000 - "/home/ubuntu/git/rq"
RUNNING TEST: test_adminoper.rb
test_adminoper.rb: Run options:
test_adminoper.rb:
test_adminoper.rb: # Running tests:
test_adminoper.rb:
test_adminoper.rb: ............
test_adminoper.rb:
test_adminoper.rb: Finished tests in 0.003026s, 3965.9995 tests/s, 16194.4979 assertions/s.
test_adminoper.rb:
test_adminoper.rb: 12 tests, 49 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_config_change.rb
test_config_change.rb: Run options:
test_config_change.rb:
test_config_change.rb: # Running tests:
test_config_change.rb:
test_config_change.rb: .
test_config_change.rb:
test_config_change.rb: Finished tests in 0.408119s, 2.4503 tests/s, 14.7016 assertions/s.
test_config_change.rb:
test_config_change.rb: 1 tests, 6 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_hashdir.rb
test_hashdir.rb: Run options:
test_hashdir.rb:
test_hashdir.rb: # Running tests:
test_hashdir.rb:
test_hashdir.rb: ...
test_hashdir.rb:
test_hashdir.rb: Finished tests in 0.006165s, 486.6366 tests/s, 1135.4855 assertions/s.
test_hashdir.rb:
test_hashdir.rb: 3 tests, 7 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_htmlutils.rb
test_htmlutils.rb: Run options:
test_htmlutils.rb:
test_htmlutils.rb: # Running tests:
test_htmlutils.rb:
test_htmlutils.rb: ...
test_htmlutils.rb:
test_htmlutils.rb: Finished tests in 0.000657s, 4563.4595 tests/s, 30423.0631 assertions/s.
test_htmlutils.rb:
test_htmlutils.rb: 3 tests, 20 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_jsonconfigfile.rb
test_jsonconfigfile.rb: Run options:
test_jsonconfigfile.rb:
test_jsonconfigfile.rb: # Running tests:
test_jsonconfigfile.rb:
test_jsonconfigfile.rb: .......
test_jsonconfigfile.rb:
test_jsonconfigfile.rb: Finished tests in 0.004582s, 1527.7588 tests/s, 4146.7740 assertions/s.
test_jsonconfigfile.rb:
test_jsonconfigfile.rb: 7 tests, 19 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_overrides.rb
test_overrides.rb: Run options:
test_overrides.rb:
test_overrides.rb: # Running tests:
test_overrides.rb:
test_overrides.rb: ....
test_overrides.rb:
test_overrides.rb: Finished tests in 0.000511s, 7822.4308 tests/s, 43023.3695 assertions/s.
test_overrides.rb:
test_overrides.rb: 4 tests, 22 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_portaproc.rb
test_portaproc.rb: Run options:
test_portaproc.rb:
test_portaproc.rb: # Running tests:
test_portaproc.rb:
test_portaproc.rb: .
test_portaproc.rb:
test_portaproc.rb: Finished tests in 0.015788s, 63.3404 tests/s, 443.3825 assertions/s.
test_portaproc.rb:
test_portaproc.rb: 1 tests, 7 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_rule_processor.rb
test_rule_processor.rb: Run options:
test_rule_processor.rb:
test_rule_processor.rb: # Running tests:
test_rule_processor.rb:
test_rule_processor.rb: ..................
test_rule_processor.rb:
test_rule_processor.rb: Finished tests in 0.009907s, 1816.8861 tests/s, 10396.6262 assertions/s.
test_rule_processor.rb:
test_rule_processor.rb: 18 tests, 103 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_rq.sh
test_rq.sh: OK: all queue tests normal
TEST: PASSED
RUNNING TEST: send_test_coalesce.sh
send_test_coalesce.sh: Testing proper coalesce
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.587.294940
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.661.294942
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: expecting: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944'
send_test_coalesce.sh: got: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944'
send_test_coalesce.sh: Message ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944 went into proper state. ALL DONE
send_test_coalesce.sh: expecting: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944'
send_test_coalesce.sh: got: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944'
send_test_coalesce.sh: Message ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.13.735.294944 went into proper state. ALL DONE
send_test_coalesce.sh: Testing error coalesce
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.037.294945
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.108.294956
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.179.294958
send_test_coalesce.sh: Message ok err - by design went into proper state. ALL DONE
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: expecting: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.037.294945'
send_test_coalesce.sh: got: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.037.294945'
send_test_coalesce.sh: Message ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.14.037.294945 went into proper state. ALL DONE
send_test_coalesce.sh: Testing no coalesce
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.15.555.294955
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.15.627.294969
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.15.699.294971
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: Testing resend coalesce
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.297.294984
send_test_coalesce.sh: Queued message: http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.369.294986
send_test_coalesce.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_coalesce.sh: expecting: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970'
send_test_coalesce.sh: got: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970'
send_test_coalesce.sh: Message ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970 went into proper state. ALL DONE
send_test_coalesce.sh: expecting: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970'
send_test_coalesce.sh: got: 'ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970'
send_test_coalesce.sh: Message ok done - duplicate http://127.0.0.1:33193/q/test_coalesce/20140211.0656.19.223.294970 went into proper state. ALL DONE
send_test_coalesce.sh: SUCCESS - system processed all messages properly
TEST: PASSED
RUNNING TEST: send_test_sneaky.sh
send_test_sneaky.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.21.821.294982
send_test_sneaky.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.21.821.294982
send_test_sneaky.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_symlink.sh
send_test_symlink.sh: Prepped message: http://127.0.0.1:33193/q/test_symlink/20140211.0656.22.082.294996
send_test_symlink.sh: Queued message: http://127.0.0.1:33193/q/test_symlink/20140211.0656.22.082.294996
send_test_symlink.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: test_que_create_naming.sh
test_que_create_naming.sh: Checking that system is ready for que setup install...
test_que_create_naming.sh: Attempting to create a queue with a space in name
test_que_create_naming.sh: Attempting to create a queue with a '.' in name
test_que_create_naming.sh: Attempting to create a queue with a '/' in name
test_que_create_naming.sh: ALL DONE SUCCESSFULLY
TEST: PASSED
RUNNING TEST: test_run_admin_down.sh
test_run_admin_down.sh: SETTING admin DOWN
test_run_admin_down.sh: TEST que in proper oper DOWN mode
test_run_admin_down.sh: TEST que in proper oper DOWN mode
test_run_admin_down.sh: SETTING admin UP
test_run_admin_down.sh: SUCCESS - system processed all messages properly
TEST: PASSED
RUNNING TEST: test_run_admin_pause.sh
test_run_admin_pause.sh: SETTING admin PAUSE
test_run_admin_pause.sh: TEST que in proper oper PAUSE mode
test_run_admin_pause.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.23.399.295009
test_run_admin_pause.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.23.471.295011
test_run_admin_pause.sh: TEST que in proper oper PAUSE mode
test_run_admin_pause.sh: SETTING admin UP
test_run_admin_pause.sh: Message ok done - done sleeping went into proper state. ALL DONE
test_run_admin_pause.sh: Message ok done - done sleeping went into proper state. ALL DONE
test_run_admin_pause.sh: SUCCESS - system processed all messages properly
TEST: PASSED
RUNNING TEST: send_test_large.sh
send_test_large.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.24.069.295010
send_test_large.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.24.069.295010
send_test_large.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_done.rb
send_test_web_done.rb: Committed message: http://127.0.0.1:33193/q/test/20140211.0656.24.379.295013
send_test_web_done.rb: Msg ID: 20140211.0656.24.379.295013
send_test_web_done.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_prepattachdone.rb
send_test_web_prepattachdone.rb: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.24.645.295026
send_test_web_prepattachdone.rb: Msg ID: 20140211.0656.24.645.295026
send_test_web_prepattachdone.rb: Attached message: 20140211.0656.24.645.295026
send_test_web_prepattachdone.rb: Committed message: 20140211.0656.24.645.295026
send_test_web_prepattachdone.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_http11_prepattachdone.rb
send_test_web_http11_prepattachdone.rb: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.25.338.295031
send_test_web_http11_prepattachdone.rb: Msg ID: 20140211.0656.25.338.295031
send_test_web_http11_prepattachdone.rb: Attached message: 20140211.0656.25.338.295031
send_test_web_http11_prepattachdone.rb: Committed message: 20140211.0656.25.338.295031
send_test_web_http11_prepattachdone.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_prepattachdone_large.rb
send_test_web_prepattachdone_large.rb: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.26.098.295037
send_test_web_prepattachdone_large.rb: Msg ID: 20140211.0656.26.098.295037
send_test_web_prepattachdone_large.rb: Committed message: 20140211.0656.26.098.295037
send_test_web_prepattachdone_large.rb: Committed message: 20140211.0656.26.098.295037
send_test_web_prepattachdone_large.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_prepattachmime.rb
send_test_web_prepattachmime.rb: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.26.848.295043
send_test_web_prepattachmime.rb: Msg ID: 20140211.0656.26.848.295043
send_test_web_prepattachmime.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_attachdone.sh
send_test_attachdone.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.27.078.295052
send_test_attachdone.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.27.078.295052
send_test_attachdone.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_cloneattachdone.sh
send_test_cloneattachdone.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.27.390.295053
send_test_cloneattachdone.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.27.390.295053
send_test_cloneattachdone.sh: Message went into proper state.
send_test_cloneattachdone.sh: Cloned to message: http://127.0.0.1:33193/q/test/20140211.0656.27.693.295058
send_test_cloneattachdone.sh: ok
send_test_cloneattachdone.sh: Message went into proper state.
send_test_cloneattachdone.sh: Message cloned properly. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_web_prepdone.rb
send_test_web_prepdone.rb: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.28.023.295066
send_test_web_prepdone.rb: Msg ID: 20140211.0656.28.023.295066
send_test_web_prepdone.rb: Committed message: 20140211.0656.28.023.295066
send_test_web_prepdone.rb: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_done.sh
send_test_done.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.28.320.295070
send_test_done.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.28.320.295070
send_test_done.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_err.sh
send_test_err.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.28.557.295075
send_test_err.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.28.557.295075
send_test_err.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_donequick.sh
send_test_donequick.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.28.792.295080
send_test_donequick.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.28.792.295080
send_test_donequick.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_errquick.sh
send_test_errquick.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.29.028.295085
send_test_errquick.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.028.295085
send_test_errquick.sh: Message went into proper state (err). ALL DONE
TEST: PASSED
RUNNING TEST: send_test_fast_collide.sh
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.268.295090
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.358.295097
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.447.295102
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.536.295107
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.626.295112
send_test_fast_collide.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.29.714.295117
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: Message ok done - done sleeping went into proper state. ALL DONE
send_test_fast_collide.sh: SUCCESS - system processed all messages properly
TEST: PASSED
RUNNING TEST: send_test_relay_force.sh
send_test_relay_force.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.30.221.295122
send_test_relay_force.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.30.221.295122
send_test_relay_force.sh: Message went into relayed state. break
send_test_relay_force.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.30.444.296988
send_test_relay_force.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_relay.sh
send_test_relay.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.31.632.296989
send_test_relay.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.31.632.296989
send_test_relay.sh: Message went into relayed state. break
send_test_relay.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.31.857.297001
send_test_relay.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_remote_relay_force.sh
send_test_remote_relay_force.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.33.037.297002
send_test_remote_relay_force.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.33.037.297002
send_test_remote_relay_force.sh: Message went into relayed state. break
send_test_remote_relay_force.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.33.334.297012
send_test_remote_relay_force.sh: ok
send_test_remote_relay_force.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_remote_relay_force_large.sh
send_test_remote_relay_force_large.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.34.586.297013
send_test_remote_relay_force_large.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.34.586.297013
send_test_remote_relay_force_large.sh: Message went into relayed state. break
send_test_remote_relay_force_large.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.34.893.297024
send_test_remote_relay_force_large.sh: ok
send_test_remote_relay_force_large.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_remote_relay.sh
send_test_remote_relay.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.36.146.297025
send_test_remote_relay.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.36.146.297025
send_test_remote_relay.sh: Message went into relayed state. break
send_test_remote_relay.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.36.444.297036
send_test_remote_relay.sh: ok
send_test_remote_relay.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_relay_relayid_attach.sh
send_test_relay_relayid_attach.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.37.709.297037
send_test_relay_relayid_attach.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.37.709.297037
send_test_relay_relayid_attach.sh: Message went into relayed state. break
send_test_relay_relayid_attach.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.38.007.297048
send_test_relay_relayid_attach.sh: ok
send_test_relay_relayid_attach.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_relay_relayid.sh
send_test_relay_relayid.sh: Prepped message: http://127.0.0.1:33193/q/relay/20140211.0656.39.262.297049
send_test_relay_relayid.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.39.262.297049
send_test_relay_relayid.sh: Message went into relayed state. break
send_test_relay_relayid.sh: New message id: http://127.0.0.1:33193/q/test/20140211.0656.39.487.297059
send_test_relay_relayid.sh: Message went into proper state. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_resend.sh
send_test_resend.sh: Prepped message: http://127.0.0.1:33193/q/test/20140211.0656.40.672.297060
send_test_resend.sh: Queued message: http://127.0.0.1:33193/q/test/20140211.0656.40.672.297060
send_test_resend.sh: Message had proper resend count. ALL DONE
TEST: PASSED
RUNNING TEST: send_test_force_remote.sh
send_test_force_remote.sh: Queued message: http://127.0.0.1:33193/q/relay/20140211.0656.43.134.301626
send_test_force_remote.sh: Message went into proper state.
send_test_force_remote.sh: Message ok relayed - http://127.0.0.1:33193/q/test/20140211.0656.43.384.301635 went into proper state.
send_test_force_remote.sh: Checking remote delivery
send_test_force_remote.sh: Verifying original has force_remote param
send_test_force_remote.sh: Verifying relayed does not have force_remote param
send_test_force_remote.sh: SUCCESS - system sent force_remote properly
TEST: PASSED
RUNNING TEST: test_web_attach_err.rb
test_web_attach_err.rb: Run options:
test_web_attach_err.rb:
test_web_attach_err.rb: # Running tests:
test_web_attach_err.rb:
test_web_attach_err.rb: .
test_web_attach_err.rb:
test_web_attach_err.rb: Finished tests in 0.516330s, 1.9367 tests/s, 11.6205 assertions/s.
test_web_attach_err.rb:
test_web_attach_err.rb: 1 tests, 6 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_web_max_count.rb
test_web_max_count.rb: Run options:
test_web_max_count.rb:
test_web_max_count.rb: # Running tests:
test_web_max_count.rb:
test_web_max_count.rb: .......
test_web_max_count.rb:
test_web_max_count.rb: Finished tests in 6.196443s, 1.1297 tests/s, 9.1988 assertions/s.
test_web_max_count.rb:
test_web_max_count.rb: 7 tests, 57 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_web_overrides.rb
test_web_overrides.rb: Run options:
test_web_overrides.rb:
test_web_overrides.rb: # Running tests:
test_web_overrides.rb:
test_web_overrides.rb: ...
test_web_overrides.rb:
test_web_overrides.rb: Finished tests in 0.292205s, 10.2668 tests/s, 116.3566 assertions/s.
test_web_overrides.rb:
test_web_overrides.rb: 3 tests, 34 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: send_dup.rb
send_dup.rb: Run options:
send_dup.rb:
send_dup.rb: # Running tests:
send_dup.rb:
send_dup.rb: .....
send_dup.rb:
send_dup.rb: Finished tests in 4.150602s, 1.2046 tests/s, 11.5646 assertions/s.
send_dup.rb:
send_dup.rb: 5 tests, 48 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
RUNNING TEST: test_web_done_json.rb
test_web_done_json.rb: PASSED
TEST: PASSED
RUNNING TEST: env_var_test.rb
env_var_test.rb: Run options:
env_var_test.rb:
env_var_test.rb: # Running tests:
env_var_test.rb:
env_var_test.rb: .
env_var_test.rb:
env_var_test.rb: Finished tests in 0.374139s, 2.6728 tests/s, 8.0184 assertions/s.
env_var_test.rb:
env_var_test.rb: 1 tests, 3 assertions, 0 failures, 0 errors, 0 skips
TEST: PASSED
Script execution took 49 seconds.
queuemgr: trying to stop process with pid 2922...
queuemgr: process with pid 2922 successfully stopped.
-=-=-=-=-=-=-=-=-
ALL TESTS DONE
-=-=-=-=-=-=-=-=-
PASSED: 44 FAILED: 0
root@base:/home/ubuntu/git/rq#

sodabrew · 2014-02-11T21:51:43Z

Some of these automated cleanups are pretty good. The Ruby 1.9-style hash syntax isn't going to work though, needs to remain in :foo => 'bar' style. Could you also change the author to [hmmm]@kixeye.com, rather than root@hostname?

eousphoros · 2014-02-11T22:53:59Z

675e342

Reverts the Ruby 1.9-style hash change

sodabrew · 2014-02-11T23:08:31Z

Hi Patrick! I guessed right :) From your branch, use git rebase -i master to squash the hash rockets commit into the style guide commit. Rewriting the user of several commits is a little tricker: http://stackoverflow.com/a/1320317

Conflicts: code/portaproc.rb

eousphoros · 2014-02-11T23:22:34Z

Howdy Aaron! Don't mind me.. just fumbling in git. Let me squash those last two commits and read that stackoverflow article. :)

This reverts commit c475cd1. Conflicts: code/portaproc.rb

Conflicts: version.rb

eousphoros · 2014-02-12T00:11:16Z

Meh, at this point it would probably be better for me to nuke from orbit and start over. Thoughts?

sodabrew · 2014-02-12T00:28:31Z

Use git rebase instead of git merge :)

eousphoros · 2014-02-12T00:32:25Z

git rebase all the way, the problem has been the two times I have rebased I ended up with a conflict on push that needed to be resolved and merged. My git foo is lacking :(

eousphoros · 2014-02-12T00:43:41Z

Well I am feeling gimped. If you guys want to close out this pull request and apply the changes per your requirements. I just ran rubocop with a modified rule set for the ruby1.8 hash rockets (--auto-gen-config). There were a couple things I touched up by hand like the if == nil to object.nil? changes and the if $? != 0 type stuff. Plus the form.json mention since I had to dig thru code to figure that one out. Fwiw the demo I showed had people here excited about rq :) (Also along with rubocop, if you haven't played with reek yet. It is pretty epic)

sodabrew · 2014-02-12T12:40:29Z

I cherry-picked the README change for form.json to master.

sodabrew · 2014-02-12T14:38:47Z

Oh, your commits are on your master branch, that's why you're having trouble with the default rebase bevahior. I would advise to always make a branch for new commits that are non-trivial or submitted to a remote repo.

Since I've made some changes to the upstream master, you should be able to do this pretty easily:

git checkout master
git remote add upstream git@github.com:brightroll/rq
git pull upstream master --rebase

sodabrew · 2014-03-14T20:58:35Z

Closing in favor of #48 (merge is pending some adjustments in that branch).

root added 3 commits February 11, 2014 06:33

Style guide and general cleanup

890046a

Cleaner

2d4e540

Add mention about form.json

45cbd93

Go back to ruby1.8 hash rockets :(

675e342

root and others added 2 commits February 11, 2014 23:17

Code janitor with an added mention of form.json

c475cd1

Merge branch 'master' of https://github.com/eousphoros/rq

706e08c

Conflicts: code/portaproc.rb

Patrick Buckley added 3 commits February 11, 2014 23:36

Revert "Code janitor with an added mention of form.json"

92802ba

This reverts commit c475cd1. Conflicts: code/portaproc.rb

Merge branch 'master'

2788ecb

Merge branch 'master' of https://github.com/eousphoros/rq

97df512

Conflicts: version.rb

sodabrew mentioned this pull request Feb 12, 2014

Rebase of PR 47 #48

Open

sodabrew closed this Mar 14, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup and update documentation to mention form.json#47

Cleanup and update documentation to mention form.json#47
eousphoros wants to merge 9 commits intobrightroll:masterfrom
eousphoros:master

eousphoros commented Feb 11, 2014

Uh oh!

sodabrew commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 11, 2014

Uh oh!

sodabrew commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

sodabrew commented Mar 14, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

eousphoros commented Feb 11, 2014

Uh oh!

sodabrew commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 11, 2014

Uh oh!

sodabrew commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 11, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

eousphoros commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

sodabrew commented Feb 12, 2014

Uh oh!

sodabrew commented Mar 14, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants