File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -158,16 +158,9 @@ bpwatch stop clear_old_venvs
158158# Restore old artifacts from the cache.
159159
160160bpwatch start restore_cache
161- CF_STACK=${CF_STACK:- lucid64}
162- if [ -f $CACHE_DIR /.cf_stack ]; then
163- CACHED_CF_STACK=` cat $CACHE_DIR /.cf_stack`
164-
165- if [ " $CACHED_CF_STACK " = " $CF_STACK " ]; then
166- for dir in $CACHED_DIRS ; do
167- cp -R $CACHE_DIR /$dir . & > /dev/null || true
168- done
169- fi
170- fi
161+ for dir in $CACHED_DIRS ; do
162+ cp -R $CACHE_DIR /$dir . & > /dev/null || true
163+ done
171164bpwatch stop restore_cache
172165
173166set +e
@@ -232,7 +225,6 @@ bpwatch start dump_cache
232225 for dir in $CACHED_DIRS ; do
233226 rm -rf $CACHE_DIR /$dir
234227 cp -R $dir $CACHE_DIR /
235- echo " $CF_STACK " > $CACHE_DIR /.cf_stack
236228 done
237229bpwatch stop dump_cache
238230
Original file line number Diff line number Diff line change @@ -71,4 +71,4 @@ DEPENDENCIES
7171 rspec-instafail
7272
7373BUNDLED WITH
74- 1.10.2
74+ 1.10.3
Original file line number Diff line number Diff line change 44 subject ( :app ) { Machete . deploy_app ( app_name ) }
55 let ( :browser ) { Machete ::Browser . new ( app ) }
66
7- describe 'switching stacks' do
8- subject ( :app ) { Machete . deploy_app ( app_name , stack : 'lucid64' ) }
9- let ( :app_name ) { 'flask_web_app_not_vendored' }
10-
11- specify do
12- expect ( app ) . to be_running ( 60 )
13-
14- browser . visit_path ( '/' )
15- expect ( browser ) . to have_body ( 'Hello, World!' )
16-
17- replacement_app = Machete ::App . new ( app_name , Machete ::Host . create , stack : 'cflinuxfs2' )
18-
19- app_push_command = Machete ::CF ::PushApp . new
20- app_push_command . execute ( replacement_app )
21-
22- expect ( replacement_app ) . to be_running ( 60 )
23-
24- browser . visit_path ( '/' )
25- expect ( browser ) . to have_body ( 'Hello, World!' )
26-
27- end
28- end
29-
307 context 'with cached buildpack dependencies' do
318 context 'in an offline environment' , if : Machete ::BuildpackMode . offline? do
329 context 'app has dependencies' do
You can’t perform that action at this time.
0 commit comments