Skip to content

Command sketch new do not join sketchbook path to sketch name if only sketchname is provided #396

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

Merged
merged 16 commits into from
Sep 11, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move sketch new test in separate test_new.py file
  • Loading branch information
Roberto Sora committed Sep 11, 2019
commit f4b227cb3f3e9e53ec5855e35a18850b296daaaf
29 changes: 0 additions & 29 deletions test/test_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,11 @@
# a commercial license, send an email to license@arduino.cc.
import json
import os

import pytest

from .common import running_on_ci


def test_sketch_new(run_command):
# Create a test sketch in current directory
current_path = os.getcwd()
sketch_name = "SketchNewIntegrationTest"
current_sketch_path = os.path.join(current_path, sketch_name)
result = run_command("sketch new {}".format(sketch_name))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))

# Create a test sketch in current directory but using an absolute path
sketch_name = "SketchNewIntegrationTestAbsolute"
current_sketch_path = os.path.join(current_path, sketch_name)
result = run_command("sketch new {}".format(current_sketch_path))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))

# Create a test sketch in current directory subpath but using an absolute path
sketch_name = "SketchNewIntegrationTestSubpath"
sketch_subpath = os.path.join("subpath", sketch_name)
current_sketch_path = os.path.join(current_path, sketch_subpath)
result = run_command("sketch new {}".format(sketch_subpath))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))


def test_compile_without_fqbn(run_command):
# Init the environment explicitly
result = run_command("core update-index")
Expand Down
43 changes: 43 additions & 0 deletions test/test_new.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# This file is part of arduino-cli.
Copy link
Contributor

Choose a reason for hiding this comment

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

can we name this test_sketch.py for consistency?

#
# Copyright 2019 ARDUINO SA (http://www.arduino.cc/)
#
# This software is released under the GNU General Public License version 3,
# which covers the main part of arduino-cli.
# The terms of this license can be found at:
# https://www.gnu.org/licenses/gpl-3.0.en.html
#
# You can be released from the requirements of the above licenses by purchasing
# a commercial license. Buying such a license is mandatory if you want to modify or
# otherwise use the software for commercial activities involving the Arduino
# software without disclosing the source code of your own applications. To purchase
# a commercial license, send an email to license@arduino.cc.
import os


def test_sketch_new(run_command):
# Create a test sketch in current directory
current_path = os.getcwd()
sketch_name = "SketchNewIntegrationTest"
current_sketch_path = os.path.join(current_path, sketch_name)
result = run_command("sketch new {}".format(sketch_name))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))

# Create a test sketch in current directory but using an absolute path
sketch_name = "SketchNewIntegrationTestAbsolute"
current_sketch_path = os.path.join(current_path, sketch_name)
result = run_command("sketch new {}".format(current_sketch_path))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))

# Create a test sketch in current directory subpath but using an absolute path
sketch_name = "SketchNewIntegrationTestSubpath"
sketch_subpath = os.path.join("subpath", sketch_name)
current_sketch_path = os.path.join(current_path, sketch_subpath)
result = run_command("sketch new {}".format(sketch_subpath))
assert result.ok
assert "Sketch created in: {}".format(current_sketch_path) in result.stdout
assert os.path.isfile(os.path.join(current_sketch_path, sketch_name + ".ino"))