Fix integration test (#125)

* Add is_complete_request handler

* Use cztop for testing

* Use pty to give tty for jupyter console

* travis: Update dependencies

- Use czmq 4
- Use jupyter instead of ipython[notebook]

* travis: Update ruby versions

* test: Wait prompt instead of sleep

Author: mrkn

.travis.yml

@@ -1,16 +1,25 @@
 language: ruby
 
+addons:
+  apt:
+    sources:
+    - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-draft/xUbuntu_12.04/ ./'
+      key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-draft/xUbuntu_12.04/Release.key'
+    packages:
+    - libsodium-dev
+    - libczmq-dev
+
 rvm:
   - ruby-head
-  - 2.2.2
-  - 2.1.6
-  - 2.0.0
+  - 2.4.0
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
 
 before_install:
-  - "sudo apt-get install libzmq3-dev"
-  - "sudo pip install 'ipython[notebook]'"
+  - "sudo pip install 'jupyter'"
 
 script: bundle exec rake
 
 notifications:
-  irc: "chat.freenode.net#sciruby"
+  irc: "chat.freenode.net#sciruby"

Gemfile

@@ -13,3 +13,6 @@ group :plot do
   gem 'nyaplot', github: 'sciruby/nyaplot'
 end
 
+group :test do
+  gem 'cztop'
+end

jupyter_console_config.py

@@ -0,0 +1 @@
+c.InteractiveShell.colors = 'NoColor'

test/integration_test.rb

@@ -1,40 +1,50 @@
 require 'test_helper'
-require 'open3'
+require 'pty'
 require 'expect'
 
 class IntegrationTest < IRubyTest
   def setup
-    @stdin, @stdout, @stderr, @process = Open3.popen3('bin/iruby')
+    $expect_verbose = false # make true if you want to dump the output of iruby console
+
+    @in, @out, pid = PTY.spawn('bin/iruby --config=jupyter_console_config.py')
+    @waiter = Thread.start { Process.waitpid(pid) }
     expect 'In [', 30
     expect '1'
     expect ']:'
   end
 
   def teardown
-    @stdin.close
-    @stdout.close
-    @stderr.close
-    @process.kill
+    @in.close
+    @out.close
+    @waiter.join
   end
 
   def write(input)
-    @stdin.puts input
+    @out.puts input
+  end
+
+  def expect(pattern, timeout = 10)
+    assert @in.expect(pattern, timeout), "#{pattern} expected, but timeout"
   end
 
-  def expect(pattern, timeout = 1)
-    assert @stdout.expect(pattern, timeout), "#{pattern} expected"
+  def wait_prompt
+    expect 'In ['
+    expect ']:'
   end
 
   def test_interaction
     write '"Hello, world!"'
     expect '"Hello, world!"'
 
+    wait_prompt
     write 'puts "Hello!"'
     expect 'Hello!'
 
+    wait_prompt
     write '12 + 12'
     expect '24'
 
+    wait_prompt
     write 'ls'
     expect 'self.methods'
   end