Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
f0b7850d
Commit
f0b7850d
authored
Oct 17, 2014
by
Jesse Zoldak
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5609 from edx/zoldak/remove-tmp-references
Remove references to /tmp in tests
parents
3974e6d9
24f90307
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
11 deletions
+23
-11
cms/envs/test.py
+1
-1
common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py
+3
-2
lms/envs/bok_choy.env.json
+0
-5
lms/envs/bok_choy.py
+8
-1
lms/envs/test.py
+1
-1
pavelib/assets.py
+10
-1
No files found.
cms/envs/test.py
View file @
f0b7850d
...
...
@@ -138,7 +138,7 @@ CACHES = {
'mongo_metadata_inheritance'
:
{
'BACKEND'
:
'django.core.cache.backends.locmem.LocMemCache'
,
'LOCATION'
:
'/var/tmp/mongo_metadata_inheritance'
,
'LOCATION'
:
os
.
path
.
join
(
tempfile
.
gettempdir
(),
'mongo_metadata_inheritance'
)
,
'TIMEOUT'
:
300
,
'KEY_FUNCTION'
:
'util.memcache.safe_key'
,
},
...
...
common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py
View file @
f0b7850d
...
...
@@ -3,6 +3,8 @@ Tests for testing the modulestore settings migration code.
"""
import
copy
import
ddt
from
tempfile
import
mkdtemp
from
unittest
import
TestCase
from
xmodule.modulestore.modulestore_settings
import
(
convert_module_store_setting_if_needed
,
...
...
@@ -10,7 +12,6 @@ from xmodule.modulestore.modulestore_settings import (
get_mixed_stores
,
)
@ddt.ddt
class
ModuleStoreSettingsMigration
(
TestCase
):
"""
...
...
@@ -35,7 +36,7 @@ class ModuleStoreSettingsMigration(TestCase):
"collection"
:
"modulestore"
,
"db"
:
"edxapp"
,
"default_class"
:
"xmodule.hidden_module.HiddenDescriptor"
,
"fs_root"
:
"/edx/var/edxapp/data"
,
"fs_root"
:
mkdtemp
()
,
"host"
:
"localhost"
,
"password"
:
"password"
,
"port"
:
27017
,
...
...
lms/envs/bok_choy.env.json
View file @
f0b7850d
...
...
@@ -75,11 +75,6 @@
},
"FEEDBACK_SUBMISSION_EMAIL"
:
""
,
"GITHUB_REPO_ROOT"
:
"** OVERRIDDEN **"
,
"GRADES_DOWNLOAD"
:
{
"BUCKET"
:
"edx-grades"
,
"ROOT_PATH"
:
"/tmp/edx-s3/grades"
,
"STORAGE_TYPE"
:
"localfs"
},
"LMS_BASE"
:
"localhost:8003"
,
"LOCAL_LOGLEVEL"
:
"INFO"
,
"LOGGING_ENV"
:
"sandbox"
,
...
...
lms/envs/bok_choy.py
View file @
f0b7850d
...
...
@@ -4,7 +4,7 @@ Settings for bok choy tests
import
os
from
path
import
path
from
tempfile
import
mkdtemp
CONFIG_ROOT
=
path
(
__file__
)
.
abspath
()
.
dirname
()
# pylint: disable=E1120
TEST_ROOT
=
CONFIG_ROOT
.
dirname
()
.
dirname
()
/
"test_root"
...
...
@@ -42,6 +42,13 @@ update_module_store_settings(
default_store
=
os
.
environ
.
get
(
'DEFAULT_STORE'
,
'draft'
),
)
###################### Grade Downloads ######################
GRADES_DOWNLOAD
=
{
'STORAGE_TYPE'
:
'localfs'
,
'BUCKET'
:
'edx-grades'
,
'ROOT_PATH'
:
os
.
path
.
join
(
mkdtemp
(),
'edx-s3'
,
'grades'
),
}
# Configure the LMS to use our stub XQueue implementation
XQUEUE_INTERFACE
[
'url'
]
=
'http://localhost:8040'
...
...
lms/envs/test.py
View file @
f0b7850d
...
...
@@ -178,7 +178,7 @@ CACHES = {
'mongo_metadata_inheritance'
:
{
'BACKEND'
:
'django.core.cache.backends.locmem.LocMemCache'
,
'LOCATION'
:
'/var/tmp/mongo_metadata_inheritance'
,
'LOCATION'
:
os
.
path
.
join
(
tempfile
.
gettempdir
(),
'mongo_metadata_inheritance'
)
,
'TIMEOUT'
:
300
,
'KEY_FUNCTION'
:
'util.memcache.safe_key'
,
},
...
...
pavelib/assets.py
View file @
f0b7850d
...
...
@@ -8,6 +8,7 @@ from watchdog.observers import Observer
from
watchdog.events
import
PatternMatchingEventHandler
import
glob
import
traceback
import
os
from
.utils.envs
import
Env
from
.utils.cmd
import
cmd
,
django_cmd
...
...
@@ -16,7 +17,15 @@ from .utils.cmd import cmd, django_cmd
COFFEE_DIRS
=
[
'lms'
,
'cms'
,
'common'
]
SASS_LOAD_PATHS
=
[
'./common/static/sass'
]
SASS_UPDATE_DIRS
=
[
'*/static'
]
SASS_CACHE_PATH
=
'/tmp/sass-cache'
# If running at Solano labs, multiple builds could be running on the
# same VM, so do not hard code the path to /tmp.
# Instead use the thread-safe temp dir.
if
os
.
getenv
(
'TDDIUM'
):
SASS_CACHE_PATH
=
os
.
path
.
join
(
os
.
getenv
(
'TDDIUM_TMPDIR'
),
'sass-cache'
)
else
:
SASS_CACHE_PATH
=
'/tmp/sass-cache'
THEME_COFFEE_PATHS
=
[]
THEME_SASS_PATHS
=
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment