1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
|
From 664a157dfa4067adba5ce5d6d7839288b3691cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Sun, 7 Aug 2011 01:38:55 +0200
Subject: [PATCH] Fix relative-path inclusion to work with Ruby 1.9.2 and
later.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
test/test_Autoscaling_groups.rb | 2 +-
test/test_EC2.rb | 2 +-
test/test_EC2_availability_zones.rb | 2 +-
test/test_EC2_console.rb | 2 +-
test/test_EC2_elastic_ips.rb | 2 +-
test/test_EC2_image_attributes.rb | 2 +-
test/test_EC2_images.rb | 2 +-
test/test_EC2_instances.rb | 2 +-
test/test_EC2_keypairs.rb | 2 +-
test/test_EC2_password.rb | 2 +-
test/test_EC2_products.rb | 2 +-
test/test_EC2_responses.rb | 2 +-
test/test_EC2_s3_xmlsimple.rb | 2 +-
test/test_EC2_security_groups.rb | 2 +-
test/test_EC2_snapshots.rb | 2 +-
test/test_EC2_spot_instance_requests.rb | 2 +-
test/test_EC2_spot_prices.rb | 2 +-
test/test_EC2_subnets.rb | 2 +-
test/test_EC2_volumes.rb | 2 +-
test/test_ELB_load_balancers.rb | 2 +-
test/test_RDS.rb | 2 +-
test/test_helper.rb | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/test/test_Autoscaling_groups.rb b/test/test_Autoscaling_groups.rb
index 70ce3e1..4a768ff 100644
--- a/test/test_Autoscaling_groups.rb
+++ b/test/test_Autoscaling_groups.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "autoscaling " do
before do
diff --git a/test/test_EC2.rb b/test/test_EC2.rb
index 96d4cc9..8d8ffac 100644
--- a/test/test_EC2.rb
+++ b/test/test_EC2.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "The EC2 method " do
diff --git a/test/test_EC2_availability_zones.rb b/test/test_EC2_availability_zones.rb
index 2c3ae7d..ee6bd54 100644
--- a/test/test_EC2_availability_zones.rb
+++ b/test/test_EC2_availability_zones.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 availability zones" do
diff --git a/test/test_EC2_console.rb b/test/test_EC2_console.rb
index 00b16ec..e228522 100644
--- a/test/test_EC2_console.rb
+++ b/test/test_EC2_console.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "The EC2 console " do
diff --git a/test/test_EC2_elastic_ips.rb b/test/test_EC2_elastic_ips.rb
index 337f135..92031bc 100644
--- a/test/test_EC2_elastic_ips.rb
+++ b/test/test_EC2_elastic_ips.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 elastic IP addresses " do
diff --git a/test/test_EC2_image_attributes.rb b/test/test_EC2_image_attributes.rb
index 3946c90..68b1e91 100644
--- a/test/test_EC2_image_attributes.rb
+++ b/test/test_EC2_image_attributes.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 image_attributes " do
diff --git a/test/test_EC2_images.rb b/test/test_EC2_images.rb
index 8ca481f..21aea2d 100644
--- a/test/test_EC2_images.rb
+++ b/test/test_EC2_images.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "An EC2 image " do
diff --git a/test/test_EC2_instances.rb b/test/test_EC2_instances.rb
index 2d771d4..b4e7d63 100644
--- a/test/test_EC2_instances.rb
+++ b/test/test_EC2_instances.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 instances " do
diff --git a/test/test_EC2_keypairs.rb b/test/test_EC2_keypairs.rb
index f56254b..7d08962 100644
--- a/test/test_EC2_keypairs.rb
+++ b/test/test_EC2_keypairs.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 keypairs " do
diff --git a/test/test_EC2_password.rb b/test/test_EC2_password.rb
index 64cad38..9646931 100644
--- a/test/test_EC2_password.rb
+++ b/test/test_EC2_password.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "The EC2 password " do
diff --git a/test/test_EC2_products.rb b/test/test_EC2_products.rb
index bf7c178..a84d772 100644
--- a/test/test_EC2_products.rb
+++ b/test/test_EC2_products.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "An EC2 instance " do
diff --git a/test/test_EC2_responses.rb b/test/test_EC2_responses.rb
index 999c4b8..1e4ca5a 100644
--- a/test/test_EC2_responses.rb
+++ b/test/test_EC2_responses.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "The Response classes " do
diff --git a/test/test_EC2_s3_xmlsimple.rb b/test/test_EC2_s3_xmlsimple.rb
index 4ebe156..0358caa 100644
--- a/test/test_EC2_s3_xmlsimple.rb
+++ b/test/test_EC2_s3_xmlsimple.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
# NOTE : These tests exercise amazon-ec2 when used with the aws/s3 gem
# which was demonstrating some breaking behavior. The fix was to
diff --git a/test/test_EC2_security_groups.rb b/test/test_EC2_security_groups.rb
index d44235b..fc434af 100644
--- a/test/test_EC2_security_groups.rb
+++ b/test/test_EC2_security_groups.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 security groups " do
diff --git a/test/test_EC2_snapshots.rb b/test/test_EC2_snapshots.rb
index 1a13513..2e77e92 100644
--- a/test/test_EC2_snapshots.rb
+++ b/test/test_EC2_snapshots.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 snaphots " do
diff --git a/test/test_EC2_spot_instance_requests.rb b/test/test_EC2_spot_instance_requests.rb
index c751ac0..c30347a 100644
--- a/test/test_EC2_spot_instance_requests.rb
+++ b/test/test_EC2_spot_instance_requests.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "An EC2 spot instances request " do
diff --git a/test/test_EC2_spot_prices.rb b/test/test_EC2_spot_prices.rb
index 485d885..d20bede 100644
--- a/test/test_EC2_spot_prices.rb
+++ b/test/test_EC2_spot_prices.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "Spot price history " do
diff --git a/test/test_EC2_subnets.rb b/test/test_EC2_subnets.rb
index 19ece5e..60b4c4b 100644
--- a/test/test_EC2_subnets.rb
+++ b/test/test_EC2_subnets.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "The EC2 subnets " do
diff --git a/test/test_EC2_volumes.rb b/test/test_EC2_volumes.rb
index c118ca1..4170359 100644
--- a/test/test_EC2_volumes.rb
+++ b/test/test_EC2_volumes.rb
@@ -8,7 +8,7 @@
# Home:: http://github.com/grempe/amazon-ec2/tree/master
#++
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "EC2 volumes " do
diff --git a/test/test_ELB_load_balancers.rb b/test/test_ELB_load_balancers.rb
index 48fa12d..33666d0 100644
--- a/test/test_ELB_load_balancers.rb
+++ b/test/test_ELB_load_balancers.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "elb load balancers " do
before do
diff --git a/test/test_RDS.rb b/test/test_RDS.rb
index 083071d..eb29dac 100644
--- a/test/test_RDS.rb
+++ b/test/test_RDS.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.expand_path('../test_helper.rb', __FILE__)
context "rds databases " do
before do
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 14562e1..33bf0c8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -19,5 +19,5 @@ gem 'test-unit'
end
}
-require File.dirname(__FILE__) + '/../lib/AWS'
+require File.expand_path('../../lib/AWS', __FILE__)
--
1.7.6
|
GitWeb