testbot 0.7.8 → 0.7.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/CHANGELOG +4 -0
- data/lib/shared/ssh_tunnel.rb +6 -8
- data/lib/shared/version.rb +1 -1
- data/test/integration_test.rb +17 -14
- data/testbot.gemspec +1 -1
- metadata +36 -36
checksums.yaml
CHANGED
@@ -1,15 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
|
5
|
-
data.tar.gz: !binary |-
|
6
|
-
NGQxNTNmOWQxNjU4MGZjZWY4MTlhMjhiNTZlNzBhZTgzOWE1YWZmMg==
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 214b3eb9a881f00d8fa2e9c200223b08d1c75fcc
|
4
|
+
data.tar.gz: 3518c2cd25a9d31e71779a0d3210e0317efa29e0
|
7
5
|
SHA512:
|
8
|
-
metadata.gz:
|
9
|
-
|
10
|
-
MjljZDI5MWIyYzNhZWE5YTM2NTQ5ODUxZTYyMmU5MDk1OTE5OTMyODlhODQy
|
11
|
-
NWEyZDQyYWE3ZmM5ODMxMWU2ZjcxYTYxM2ExOTJlYjRiZTg1NzQ=
|
12
|
-
data.tar.gz: !binary |-
|
13
|
-
MDEwODU3MTdiNmM5YmJlNTU4MWI3OGM3N2RmMzA4NjY5ZWFmM2RhZmE2YjU4
|
14
|
-
ZGFjNzE4ZjUyNjg5M2UyNmZmYzg4ZjU0MWQ5ODA3OWJkZGI4NzVjYTMzMGE4
|
15
|
-
ZDAwZTA3ZDUzOWFkZjcwNWEzM2E4NDg2ZWU2MWZiY2EyYTMxMzQ=
|
6
|
+
metadata.gz: 7734fa42e47f14feae9158a601d86ee9b6408bc6e7941c9a2d8e68bb741dd0b4e57d78ae8a15d7ce5edf7c3404cd8596233155cec1dcbb2aee5a93ad47edc1b4
|
7
|
+
data.tar.gz: 5454ffe79bc4e61a02706fa5457befbd5167e9497994892068dc94e407f81a730def6b8dad5302f460d902a142ebb0570255682d6806c5140288f60e2be4a7b9
|
data/CHANGELOG
CHANGED
data/lib/shared/ssh_tunnel.rb
CHANGED
@@ -2,19 +2,18 @@ require 'rubygems'
|
|
2
2
|
require 'net/ssh'
|
3
3
|
|
4
4
|
class SSHTunnel
|
5
|
-
|
6
5
|
def initialize(host, user, local_port = 2288)
|
7
6
|
@host, @user, @local_port = host, user, local_port
|
8
7
|
end
|
9
|
-
|
8
|
+
|
10
9
|
def open
|
11
10
|
connect
|
12
|
-
|
11
|
+
|
13
12
|
start_time = Time.now
|
14
13
|
while true
|
15
14
|
break if @up
|
16
15
|
sleep 0.5
|
17
|
-
|
16
|
+
|
18
17
|
if Time.now - start_time > 5
|
19
18
|
puts "SSH connection failed, trying again..."
|
20
19
|
start_time = Time.now
|
@@ -22,15 +21,14 @@ class SSHTunnel
|
|
22
21
|
end
|
23
22
|
end
|
24
23
|
end
|
25
|
-
|
24
|
+
|
26
25
|
def connect
|
27
|
-
@thread.kill
|
26
|
+
@thread.kill if @thread
|
28
27
|
@thread = Thread.new do
|
29
28
|
Net::SSH.start(@host, @user, { :timeout => 1 }) do |ssh|
|
30
29
|
ssh.forward.local(@local_port, 'localhost', Testbot::SERVER_PORT)
|
31
30
|
ssh.loop { @up = true }
|
32
31
|
end
|
33
|
-
end
|
32
|
+
end
|
34
33
|
end
|
35
|
-
|
36
34
|
end
|
data/lib/shared/version.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
module Testbot
|
2
2
|
# Don't forget to update readme and changelog
|
3
3
|
def self.version
|
4
|
-
version = "0.7.
|
4
|
+
version = "0.7.9"
|
5
5
|
dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
|
6
6
|
if File.exists?(dev_version_file)
|
7
7
|
version += File.read(dev_version_file)
|
data/test/integration_test.rb
CHANGED
@@ -4,22 +4,17 @@ require 'fileutils'
|
|
4
4
|
require 'shoulda'
|
5
5
|
|
6
6
|
class IntegrationTest < Test::Unit::TestCase
|
7
|
-
|
8
|
-
def stop!
|
9
|
-
system "export INTEGRATION_TEST=true; bin/testbot --server stop > /dev/null"
|
10
|
-
system "export INTEGRATION_TEST=true; bin/testbot --runner stop > /dev/null"
|
11
|
-
end
|
12
|
-
|
13
7
|
# This is slow, and Test:Unit does not have "before/after :all" method, so I'm using a single testcase for multiple tests
|
14
8
|
should "be able to send a build request, have it run and show the results" do
|
15
9
|
Thread.new {
|
16
10
|
|
17
11
|
sleep 30
|
18
12
|
puts "Still running after 30 secs, stopping..."
|
19
|
-
stop
|
13
|
+
stop
|
20
14
|
}
|
21
15
|
|
22
|
-
|
16
|
+
cleanup
|
17
|
+
system "mkdir -p tmp/fixtures; cp -rf test/fixtures/local tmp/local"
|
23
18
|
system "export INTEGRATION_TEST=true; bin/testbot --runner --connect 127.0.0.1 --working_dir tmp/runner > /dev/null"
|
24
19
|
system "export INTEGRATION_TEST=true; bin/testbot --server > /dev/null"
|
25
20
|
|
@@ -33,12 +28,12 @@ class IntegrationTest < Test::Unit::TestCase
|
|
33
28
|
|
34
29
|
sleep 2.0
|
35
30
|
result = `cd tmp/local; INTEGRATION_TEST=true ../../bin/testbot --spec --connect 127.0.0.1 --rsync_path ../server --rsync_ignores "log/* tmp/*"`
|
36
|
-
|
31
|
+
|
37
32
|
# Should include the result from script/spec
|
38
33
|
#puts result.inspect
|
39
34
|
assert result.include?('script/spec got called with ["-O", "spec/spec.opts", "spec/models/house_spec.rb", "spec/models/car_spec.rb"]') ||
|
40
|
-
result.include?('script/spec got called with ["-O", "spec/spec.opts", "spec/models/car_spec.rb", "spec/models/house_spec.rb"]')
|
41
|
-
|
35
|
+
result.include?('script/spec got called with ["-O", "spec/spec.opts", "spec/models/car_spec.rb", "spec/models/house_spec.rb"]')
|
36
|
+
|
42
37
|
|
43
38
|
# Should not include ignored files
|
44
39
|
assert !File.exists?("tmp/server/log/test.log")
|
@@ -46,10 +41,18 @@ class IntegrationTest < Test::Unit::TestCase
|
|
46
41
|
assert !File.exists?("tmp/runner/local/log/test.log")
|
47
42
|
assert !File.exists?("tmp/runner/local/tmp/restart.txt")
|
48
43
|
end
|
49
|
-
|
44
|
+
|
50
45
|
def teardown
|
51
|
-
stop
|
52
|
-
|
46
|
+
stop
|
47
|
+
cleanup
|
48
|
+
end
|
49
|
+
|
50
|
+
def stop
|
51
|
+
system "export INTEGRATION_TEST=true; bin/testbot --server stop > /dev/null"
|
52
|
+
system "export INTEGRATION_TEST=true; bin/testbot --runner stop > /dev/null"
|
53
53
|
end
|
54
54
|
|
55
|
+
def cleanup
|
56
|
+
system "rm -rf tmp/local tmp/fixtures"
|
57
|
+
end
|
55
58
|
end
|
data/testbot.gemspec
CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
|
|
14
14
|
s.files = Dir.glob("lib/**/*") + Dir.glob("test/**/*") + %w(Gemfile .gemtest Rakefile testbot.gemspec CHANGELOG README.markdown bin/testbot) +
|
15
15
|
(File.exists?("DEV_VERSION") ? [ "DEV_VERSION" ] : [])
|
16
16
|
|
17
|
-
s.add_dependency('sinatra', '~> 1.0
|
17
|
+
s.add_dependency('sinatra', '~> 1.0')
|
18
18
|
s.add_dependency('httparty', '>= 0.6.1')
|
19
19
|
s.add_dependency('net-ssh', '>= 2.0.23')
|
20
20
|
s.add_dependency('json_pure', '>= 1.4.6')
|
metadata
CHANGED
@@ -1,167 +1,167 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: testbot
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Joakim Kolsjö
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-05-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sinatra
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - ~>
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 1.0
|
19
|
+
version: '1.0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 1.0
|
26
|
+
version: '1.0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: httparty
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- -
|
31
|
+
- - ">="
|
32
32
|
- !ruby/object:Gem::Version
|
33
33
|
version: 0.6.1
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- -
|
38
|
+
- - ">="
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: 0.6.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: net-ssh
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- -
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: 2.0.23
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- -
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: 2.0.23
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: json_pure
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
59
|
+
- - ">="
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: 1.4.6
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- -
|
66
|
+
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: 1.4.6
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: daemons
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- -
|
73
|
+
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: 1.0.10
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- -
|
80
|
+
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: 1.0.10
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: acts_as_rails3_generator
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- -
|
87
|
+
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- -
|
94
|
+
- - ">="
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: posix-spawn
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- -
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: 0.3.6
|
104
104
|
type: :runtime
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- -
|
108
|
+
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: 0.3.6
|
111
111
|
- !ruby/object:Gem::Dependency
|
112
112
|
name: shoulda
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
114
114
|
requirements:
|
115
|
-
- -
|
115
|
+
- - ">="
|
116
116
|
- !ruby/object:Gem::Version
|
117
117
|
version: '0'
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
|
-
- -
|
122
|
+
- - ">="
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: rack-test
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
|
-
- -
|
129
|
+
- - ">="
|
130
130
|
- !ruby/object:Gem::Version
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
|
-
- -
|
136
|
+
- - ">="
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: flexmock
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
|
-
- -
|
143
|
+
- - ">="
|
144
144
|
- !ruby/object:Gem::Version
|
145
145
|
version: '0'
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
|
-
- -
|
150
|
+
- - ">="
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: rvm
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
|
-
- -
|
157
|
+
- - ">="
|
158
158
|
- !ruby/object:Gem::Version
|
159
159
|
version: '0'
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
|
-
- -
|
164
|
+
- - ">="
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0'
|
167
167
|
- !ruby/object:Gem::Dependency
|
@@ -182,42 +182,42 @@ dependencies:
|
|
182
182
|
name: bundler
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- -
|
185
|
+
- - ">="
|
186
186
|
- !ruby/object:Gem::Version
|
187
187
|
version: '0'
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
|
-
- -
|
192
|
+
- - ">="
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: guard
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
|
-
- -
|
199
|
+
- - ">="
|
200
200
|
- !ruby/object:Gem::Version
|
201
201
|
version: '0'
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
|
-
- -
|
206
|
+
- - ">="
|
207
207
|
- !ruby/object:Gem::Version
|
208
208
|
version: '0'
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: guard-test
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
|
-
- -
|
213
|
+
- - ">="
|
214
214
|
- !ruby/object:Gem::Version
|
215
215
|
version: '0'
|
216
216
|
type: :development
|
217
217
|
prerelease: false
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
|
-
- -
|
220
|
+
- - ">="
|
221
221
|
- !ruby/object:Gem::Version
|
222
222
|
version: '0'
|
223
223
|
description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2,
|
@@ -229,7 +229,7 @@ executables:
|
|
229
229
|
extensions: []
|
230
230
|
extra_rdoc_files: []
|
231
231
|
files:
|
232
|
-
- .gemtest
|
232
|
+
- ".gemtest"
|
233
233
|
- CHANGELOG
|
234
234
|
- Gemfile
|
235
235
|
- README.markdown
|
@@ -296,17 +296,17 @@ require_paths:
|
|
296
296
|
- lib
|
297
297
|
required_ruby_version: !ruby/object:Gem::Requirement
|
298
298
|
requirements:
|
299
|
-
- -
|
299
|
+
- - ">="
|
300
300
|
- !ruby/object:Gem::Version
|
301
301
|
version: '0'
|
302
302
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
303
303
|
requirements:
|
304
|
-
- -
|
304
|
+
- - ">="
|
305
305
|
- !ruby/object:Gem::Version
|
306
306
|
version: '0'
|
307
307
|
requirements: []
|
308
308
|
rubyforge_project:
|
309
|
-
rubygems_version: 2.2.
|
309
|
+
rubygems_version: 2.2.2
|
310
310
|
signing_key:
|
311
311
|
specification_version: 4
|
312
312
|
summary: A test distribution tool.
|