Skip to content

Commit

Permalink
updated integration tests and updated travis commands for it
Browse files Browse the repository at this point in the history
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
  • Loading branch information
BlackIkeEagle committed Feb 19, 2018
1 parent f41221e commit 97b7d08
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -12,8 +12,8 @@ before_install:
- docker ps
install:
- |-
docker exec -t vdebug-distro-test bash -c "apt-get update && apt-get install -y sudo vim-gtk3 xvfb python3 ruby-dev gcc make automake libtool && gem install bundler && useradd -u $(id -u) -M -s /bin/bash -d /travis travis && echo '%travis ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/travis"
docker exec -t vdebug-distro-test bash -c "apt-get update && apt-get install -y sudo vim-gtk3 xvfb python3 ruby-dev gcc make automake libtool php-cli php-xdebug locales && gem install bundler && locale-gen en_US.UTF-8 && echo 'LANG=en_US.UTF-8' > /etc/default/locale && useradd -u $(id -u) -M -s /bin/bash -d /travis travis && echo '%travis ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/travis"
- docker exec -t vdebug-distro-test su - travis -c "bundle install"
script:
- docker exec -t vdebug-distro-test su - travis -c "python3 -m unittest discover"
#- docker exec -t vdebug-distro-test su - travis -c "xvfb-run bundle exec rake spec features"
- docker exec -t vdebug-distro-test su - travis -c "xvfb-run bundle exec rake spec features"
12 changes: 6 additions & 6 deletions rubylib/vdebug.rb
Expand Up @@ -20,7 +20,7 @@ def start_listening
set_opt "debug_file", "/tmp/vdebug.log"
end
set_opt "background_listener", 0
vim.server.remote_send ":python debugger.run()<CR>"
vim.server.remote_send ":python3 debugger.run()<CR>"
sleep 2
end

Expand All @@ -33,20 +33,20 @@ def messages
end

def last_error
vim.command("python debugger.get_last_error()")
vim.command("python3 debugger.get_last_error()")
end

def step_to_line(number)
vim.command "#{number}"
vim.command "python debugger.run_to_cursor()"
vim.command "python3 debugger.run_to_cursor()"
end

def step_over
vim.command 'python debugger.step_over()'
vim.command 'python3 debugger.step_over()'
end

def step_in
vim.command 'python debugger.step_into()'
vim.command 'python3 debugger.step_into()'
end

def trace(expression)
Expand Down Expand Up @@ -86,7 +86,7 @@ def running?

def connected?
status = vim.command(
"python print debugger.status()"
"python3 print debugger.status()"
)
%w(break running).include? status
end
Expand Down
6 changes: 3 additions & 3 deletions spec/vdebug_spec.rb
Expand Up @@ -20,7 +20,7 @@

it "should send the command to start vdebug" do
vim.server.should_receive(:remote_send).
with(":python debugger.run()<CR>")
with(":python3 debugger.run()<CR>")
vdebug.start_listening
end
end
Expand All @@ -31,7 +31,7 @@
context "step over" do
it "should send the command to vdebug" do
vim.should_receive(:command).
with('python debugger.step_over()')
with('python3 debugger.step_over()')
vdebug.step_over
end
end
Expand All @@ -41,7 +41,7 @@
context "asking whether it's connected" do
it "should query the vdebug api" do
vim.should_receive(:command).
with("python print debugger.status()").
with("python3 print debugger.status()").
and_return("break")
vdebug.connected?
end
Expand Down

0 comments on commit 97b7d08

Please sign in to comment.