Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/cdodge/exporting video modules #425

Merged
merged 2 commits into from
Jul 18, 2013

Conversation

chrisndodge
Copy link
Contributor

No description provided.

@chrisndodge
Copy link
Contributor Author

@wedaly this fixes broken test. The problem was that clone_item() was deprecated on master in between the time the hotfix was made and when it was merged in.

@cpennington this also does the improvement that you asked for by not parsing an XML formatted string

Can you get to this ASAP since master is broken now?

@wedaly
Copy link
Contributor

wedaly commented Jul 17, 2013

👍 Thanks for fixing this!

parent = verticals[0]
module_store.update_children(parent.location, parent.children + [new_component_location.url()])

resp = self.client.post(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could use:
ItemFactory.create(
parent_location=parent.location,
category="video",
display_name="untitled")
Same effect but doesn't go thru url handler (views)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should use module_store.create_and_save_xmodule here, rather than using the django test client. Actually, an even better fix would be to use a CourseFactory and a ItemFactory, so that this test doesn't have to know about future changes to how to construct xmodules.

…ich has been deprecated, and thus breaking the test
@chrisndodge
Copy link
Contributor Author

@dmitchell @cpennington can you sign off? I took Don's solution as I have to head into a 1.5 hour meeting. Unfortunately, when I rebase -i, I took the wrong commit message. But can we move forward?

@dmitchell
Copy link
Contributor

There's a bug partly due to the test:

  File "/usr/lib/python2.7/unittest/case.py", line 327, in run testMethod()
  File "/vol/ebs-01/jenkins/jobs/edx-feature-branch-tests/workspace/common/lib/xmodule/xmodule/tests/test_export.py", line 114, in test_toy_roundtrip
 self.check_export_roundtrip(DATA_DIR, "toy")
 File "/vol/ebs-01/jenkins/jobs/edx-feature-branch tests/workspace/common/lib/xmodule/xmodule/tests/test_export.py", line 106, in check_export_roundtrip
second_import.modules[course_id][location])
AssertionError: first_import != second_import

Equivalence is tripping on the import systems != which should be irrelevant AND on display_names not being == which may be more important.

@chrisndodge
Copy link
Contributor Author

ok, looking into it. This is more complicated than I hoped....

@chrisndodge
Copy link
Contributor Author

@cpennington @wedaly @dmitchell

I think the stop gap here is to remove that new (which I added)

OK with you all?

Waiting to see test results - this passes on my localdev.

@cpennington
Copy link
Contributor

You mean etree.fromstring('<video />') != etree.Element('video')?

@wedaly
Copy link
Contributor

wedaly commented Jul 18, 2013

@chrisndodge That makes sense

@cpennington
Copy link
Contributor

Yeah, 👍 to removing the <video ...> tag from the test course for now.

chrisndodge pushed a commit that referenced this pull request Jul 18, 2013
@chrisndodge chrisndodge merged commit 8300bb5 into master Jul 18, 2013
@cpennington cpennington deleted the fix/cdodge/exporting-video-modules branch July 18, 2013 15:57
chrisrossi pushed a commit to jazkarta/edx-platform that referenced this pull request Mar 31, 2014
e-kolpakov referenced this pull request in open-craft/edx-platform May 15, 2015
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
fredsmith pushed a commit that referenced this pull request Aug 13, 2015
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
Kelketek referenced this pull request in open-craft/edx-platform Sep 17, 2015
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
itsjeyd referenced this pull request in open-craft/edx-platform Aug 18, 2016
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
mtyaka referenced this pull request in open-craft/edx-platform Jun 13, 2017
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
ziafazal pushed a commit that referenced this pull request Dec 12, 2017
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
ziafazal pushed a commit that referenced this pull request Dec 12, 2017
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
ziafazal pushed a commit that referenced this pull request Dec 12, 2017
Merge Release back into master
Conflicts:
	cms/envs/aws.py
	requirements/edx/custom.txt
jfavellar90 pushed a commit to eduNEXT/edx-platform that referenced this pull request Apr 11, 2018
yoann-mroz pushed a commit to weuplearning/edx-platform that referenced this pull request Nov 30, 2020
andrey-canon added a commit to eduNEXT/edx-platform that referenced this pull request Jan 19, 2021
ju/ednx/FD-4 Change logo and favicon in LMS and Studio
Sujeet1379 pushed a commit to chandrudev/edx-platform that referenced this pull request Nov 17, 2022
Sujeet1379 pushed a commit to chandrudev/edx-platform that referenced this pull request Nov 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants