diff options
author | azul <azul@riseup.net> | 2017-09-23 15:11:20 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2017-09-23 15:11:20 +0000 |
commit | fac140a8ff76e98c275194845125d4c97f4ba07b (patch) | |
tree | 08ffafb2c70935892e975704911080b9da84e391 /test/functional/sample_test.rb | |
parent | 787287318c54b019a12ef79525c9f5b10d93724d (diff) | |
parent | 8ac6bb8492c9a3b9ec5d7b5bf2b35907a1f8c332 (diff) |
Merge branch 'rubocop' into 'master'
Style fixes based on Rubocop
See merge request leap/nickserver!19
Diffstat (limited to 'test/functional/sample_test.rb')
-rw-r--r-- | test/functional/sample_test.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/functional/sample_test.rb b/test/functional/sample_test.rb index 2b49527..412555e 100644 --- a/test/functional/sample_test.rb +++ b/test/functional/sample_test.rb @@ -1,3 +1,4 @@ +require 'English' require 'support/functional_test' class SampleTest < FunctionalTest @@ -49,7 +50,7 @@ class SampleTest < FunctionalTest end def lookup(address) - run_command %Q(curl localhost:6425 #{curl_opts} -d "address=#{address}") + run_command %(curl localhost:6425 #{curl_opts} -d "address=#{address}") end def curl_opts @@ -57,13 +58,13 @@ class SampleTest < FunctionalTest end def open_files_count - run_command(%Q(lsof | grep " #{nickserver_pid} " | wc -l)).to_i + run_command(%(lsof | grep " #{nickserver_pid} " | wc -l)).to_i end def run_command(command) `#{command} 2>&1`.tap do |out| - assert ($?.exitstatus == 0), - "failed to run '#{command}':\n #{out}" + assert ($CHILD_STATUS.exitstatus == 0), + "failed to run '#{command}':\n #{out}" end end end |