Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d1970596
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d1970596
编写于
10月 19, 2018
作者:
Y
Yuji Yaginuma
提交者:
GitHub
10月 19, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #34256 from y-yagi/make_aj_integration_tests_work_on_ci_2
Make AJ integration tests work in CI
上级
f8a2304f
7eba1137
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
30 addition
and
18 deletion
+30
-18
.travis.yml
.travis.yml
+21
-2
activejob/test/support/integration/adapters/backburner.rb
activejob/test/support/integration/adapters/backburner.rb
+2
-1
activejob/test/support/integration/adapters/que.rb
activejob/test/support/integration/adapters/que.rb
+2
-1
activejob/test/support/integration/adapters/queue_classic.rb
activejob/test/support/integration/adapters/queue_classic.rb
+2
-1
activejob/test/support/integration/adapters/sneakers.rb
activejob/test/support/integration/adapters/sneakers.rb
+3
-13
未找到文件。
.travis.yml
浏览文件 @
d1970596
...
...
@@ -36,8 +36,6 @@ before_install:
-
"
rm
${BUNDLE_GEMFILE}.lock"
-
"
travis_retry
gem
update
--system"
-
"
travis_retry
gem
install
bundler"
-
"
[
-f
/tmp/beanstalkd-1.10/Makefile
]
||
(curl
-L
https://github.com/kr/beanstalkd/archive/v1.10.tar.gz
|
tar
xz
-C
/tmp)"
-
"
pushd
/tmp/beanstalkd-1.10
&&
make
&&
(./beanstalkd
&);
popd"
-
"
[[
-z
$encrypted_0fb9444d0374_key
&&
-z
$encrypted_0fb9444d0374_iv
]]
||
openssl
aes-256-cbc
-K
$encrypted_0fb9444d0374_key
-iv
$encrypted_0fb9444d0374_iv
-in
activestorage/test/service/configurations.yml.enc
-out
activestorage/test/service/configurations.yml
-d"
-
"
[[
$GEM
!=
'av:ujs'
]]
||
nvm
install
node"
-
"
[[
$GEM
!=
'av:ujs'
]]
||
node
--version"
...
...
@@ -101,23 +99,44 @@ matrix:
-
rvm
:
2.5.1
env
:
"
GEM=av:ujs"
-
rvm
:
2.4.4
sudo
:
required
env
:
"
GEM=aj:integration"
services
:
-
memcached
-
redis-server
-
rabbitmq
before_install
:
-
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
-
"
sudo
sed
-i
's/port
=
5433/port
=
5432/'
/etc/postgresql/10/main/postgresql.conf"
-
"
sudo
service
postgresql
restart
10"
-
"
[
-f
/tmp/beanstalkd-1.10/Makefile
]
||
(curl
-L
https://github.com/kr/beanstalkd/archive/v1.10.tar.gz
|
tar
xz
-C
/tmp)"
-
"
pushd
/tmp/beanstalkd-1.10
&&
make
&&
(./beanstalkd
&);
popd"
-
rvm
:
2.5.1
sudo
:
required
env
:
"
GEM=aj:integration"
services
:
-
memcached
-
redis-server
-
rabbitmq
before_install
:
-
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
-
"
sudo
sed
-i
's/port
=
5433/port
=
5432/'
/etc/postgresql/10/main/postgresql.conf"
-
"
sudo
service
postgresql
restart
10"
-
"
[
-f
/tmp/beanstalkd-1.10/Makefile
]
||
(curl
-L
https://github.com/kr/beanstalkd/archive/v1.10.tar.gz
|
tar
xz
-C
/tmp)"
-
"
pushd
/tmp/beanstalkd-1.10
&&
make
&&
(./beanstalkd
&);
popd"
-
rvm
:
ruby-head
sudo
:
required
env
:
"
GEM=aj:integration"
services
:
-
memcached
-
redis-server
-
rabbitmq
before_install
:
-
sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
-
"
sudo
sed
-i
's/port
=
5433/port
=
5432/'
/etc/postgresql/10/main/postgresql.conf"
-
"
sudo
service
postgresql
restart
10"
-
"
[
-f
/tmp/beanstalkd-1.10/Makefile
]
||
(curl
-L
https://github.com/kr/beanstalkd/archive/v1.10.tar.gz
|
tar
xz
-C
/tmp)"
-
"
pushd
/tmp/beanstalkd-1.10
&&
make
&&
(./beanstalkd
&);
popd"
-
rvm
:
2.4.4
env
:
"
GEM=ar:mysql2"
sudo
:
required
...
...
activejob/test/support/integration/adapters/backburner.rb
浏览文件 @
d1970596
...
...
@@ -8,7 +8,8 @@ def setup
end
unless
can_run?
puts
"Cannot run integration tests for backburner. To be able to run integration tests for backburner you need to install and start beanstalkd.
\n
"
exit
status
=
ENV
[
"CI"
]
?
false
:
true
exit
status
end
end
...
...
activejob/test/support/integration/adapters/que.rb
浏览文件 @
d1970596
...
...
@@ -32,7 +32,8 @@ def start_workers
rescue
Sequel
::
DatabaseConnectionError
puts
"Cannot run integration tests for que. To be able to run integration tests for que you need to install and start postgresql.
\n
"
exit
status
=
ENV
[
"CI"
]
?
false
:
true
exit
status
end
def
stop_workers
...
...
activejob/test/support/integration/adapters/queue_classic.rb
浏览文件 @
d1970596
...
...
@@ -30,7 +30,8 @@ def start_workers
rescue
PG
::
ConnectionBad
puts
"Cannot run integration tests for queue_classic. To be able to run integration tests for queue_classic you need to install and start postgresql.
\n
"
exit
status
=
ENV
[
"CI"
]
?
false
:
true
exit
status
end
def
stop_workers
...
...
activejob/test/support/integration/adapters/sneakers.rb
浏览文件 @
d1970596
# frozen_string_literal: true
require
"sneakers/runner"
require
"sneakers/publisher"
require
"timeout"
module
Sneakers
class
Publisher
def
safe_ensure_connected
@mutex
.
synchronize
do
ensure_connection!
unless
connected?
end
end
end
end
module
SneakersJobsManager
def
setup
ActiveJob
::
Base
.
queue_adapter
=
:sneakers
...
...
@@ -29,7 +18,8 @@ def setup
log:
Rails
.
root
.
join
(
"log/sneakers.log"
).
to_s
unless
can_run?
puts
"Cannot run integration tests for sneakers. To be able to run integration tests for sneakers you need to install and start rabbitmq.
\n
"
exit
status
=
ENV
[
"CI"
]
?
false
:
true
exit
status
end
end
...
...
@@ -79,7 +69,7 @@ def can_run?
def
bunny_publisher
@bunny_publisher
||=
begin
p
=
ActiveJob
::
QueueAdapters
::
SneakersAdapter
::
JobWrapper
.
send
(
:publisher
)
p
.
safe_ensure_connected
p
.
ensure_connection!
p
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录